From rangi at users.sourceforge.net Sun Feb 1 06:21:24 2004 From: rangi at users.sourceforge.net (Chris Cormack) Date: Sat, 31 Jan 2004 21:21:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-user.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8254/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: Fix for 617 and 615 Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-user.tmpl 18 Mar 2003 19:52:37 -0000 1.2 --- opac-user.tmpl 1 Feb 2004 05:21:21 -0000 1.2.2.1 *************** *** 140,144 **** --- 140,148 ---- + + Not renewable + Renew + Not renewable *************** *** 227,231 **** ! Renew --- 231,235 ---- ! Renew From rangi at users.sourceforge.net Sun Feb 1 06:34:19 2004 From: rangi at users.sourceforge.net (Chris Cormack) Date: Sat, 31 Jan 2004 21:34:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-user.tmpl,1.2.2.1,1.2.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19230/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: missed one instance of renewable Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** opac-user.tmpl 1 Feb 2004 05:21:21 -0000 1.2.2.1 --- opac-user.tmpl 1 Feb 2004 05:34:17 -0000 1.2.2.2 *************** *** 139,143 **** ! Not renewable --- 139,143 ---- ! Not renewable From tipaul at users.sourceforge.net Fri Feb 6 15:06:39 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:06:39 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.fr,1.1.2.3,1.1.2.4 tmpl_process.pl,1.5.2.6,1.5.2.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/misc/translator Modified Files: Tag: rel_2_0 intranet.fr tmpl_process.pl Log Message: updated french translation Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** intranet.fr 26 Jan 2004 10:42:27 -0000 1.1.2.3 --- intranet.fr 6 Feb 2004 14:06:36 -0000 1.1.2.4 *************** *** 1,19 **** A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table Une "catégorie thésaurus": se réfère à une catégorie du thésaurus. Voir la table admin correspondante. A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically Un "constructeur de valeur": les constructeurs de valeurs sont des programmes Perl qui vous aide à sélectionner les entrées d'un champ selon une syntaxe MARC. Ils remplissent aussi parfois automatiquement des sous-champs. - A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm UNUSED;Une notice MARC est stockée dans le réservoir aussi lontemps que vous ne lui liez pas d'ouvrage. Lorsque vous saisissez un ISBN ou un titre d'ouvrage, les notices du réservoire sont passées en revues. Si une notice correspondante est trouvée, elle est transférée dans la table active de Koha et supprimée du réservoire. About A propos Abstract Résumé ! Account for ***** Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE Acquisitions Acquisitions ! acquisitions UNUSED;acquisitions [...1006 lines suppressed...] ! Volume Info (for serials) Info Volume (pour périodiques) Waiting En attente WAITING EN ATTENTE --- 1058,1073 ---- value=> ***** values authorised for this subfield valeurs autorisées pour ce sous-champ ! Values related to ***** ! Values related to () UNUSED;1 Variable Variable Various parameters Divers paramètres View Basket Voir Panier Virtual Bookshelves Rayonnages virtuels + Virtual shelves Rayonnages virtuels Volume Volume Volume Date Date Volume Volume Description Description Volume ! Volume Info (for serials ***** ! Volume Info (for serials) UNUSED;Info Volume (pour périodiques) Waiting En attente WAITING EN ATTENTE Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.5.2.6 retrieving revision 1.5.2.7 diff -C2 -r1.5.2.6 -r1.5.2.7 *** tmpl_process.pl 28 Jan 2004 16:46:23 -0000 1.5.2.6 --- tmpl_process.pl 6 Feb 2004 14:06:36 -0000 1.5.2.7 *************** *** 295,299 **** print "Processing $in...\n"; ! # Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; --- 295,299 ---- print "Processing $in...\n"; ! # 'Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; *************** *** 304,309 **** { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^\s+//; # remove trailing blanks, ':' or '*' ! $str =~ s/[\s\*:\[*\(|\.,]*$//; # the line begins with letter(s) followed by optional words and/or spaces --- 304,309 ---- { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^[\s+:\(]*//; # remove useless characters ! $str =~ s/[\s\*:\[*\(|\.,\)]*$//; # the line begins with letter(s) followed by optional words and/or spaces From tipaul at users.sourceforge.net Fri Feb 6 15:10:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:10:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en auth.tmpl,1.4.2.1,1.4.2.2 default.tmpl,1.2,1.2.2.1 member-flags.tmpl,1.2,1.2.2.1 modbibitem.tmpl,1.5,1.5.2.1 newimember.tmpl,1.4.2.1,1.4.2.2 newjmember.tmpl,1.4,1.4.2.1 newmember.tmpl,1.10.2.1,1.10.2.2 opac-main.tmpl,1.2,1.2.2.1 request.tmpl,1.10.2.1,1.10.2.2 shelves.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8000/koha-tmpl/intranet-tmpl/default/en Modified Files: Tag: rel_2_0 auth.tmpl default.tmpl member-flags.tmpl modbibitem.tmpl newimember.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl request.tmpl shelves.tmpl Log Message: template fixes for translation Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** auth.tmpl 19 Dec 2003 17:19:48 -0000 1.4.2.1 --- auth.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.2 *************** *** 35,39 **** ! --- 35,39 ----
Koha Login
Cardnumber:
Password:
! Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/default.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** default.tmpl 9 Dec 2003 10:28:57 -0000 1.2 --- default.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 24,28 ****
Koha Login
Card number:
Password:

! Results through of records.
--- 24,28 ----
! Results through of records.
Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** member-flags.tmpl 9 Dec 2003 10:28:57 -0000 1.2 --- member-flags.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 23,27 ****

! --- 23,27 ----

! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** modbibitem.tmpl 9 Dec 2003 10:28:57 -0000 1.5 --- modbibitem.tmpl 6 Feb 2004 14:10:06 -0000 1.5.2.1 *************** *** 24,28 **** ! Item Type" size=20> --- 24,28 ---- ! Item type" size=20> *************** *** 77,81 **** Location Date Due ! Last Seen --- 77,81 ---- Location Date Due ! Last seen Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** newimember.tmpl 22 Dec 2003 14:56:35 -0000 1.4.2.1 --- newimember.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.2 *************** *** 37,41 **** ! Card Number --- 37,41 ---- ! Card number Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** newjmember.tmpl 9 Dec 2003 10:28:58 -0000 1.4 --- newjmember.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.1 *************** *** 42,46 **** ! Date Of Birth --- 42,46 ---- ! Date of birth Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -r1.10.2.1 -r1.10.2.2 *** newmember.tmpl 26 Jan 2004 10:46:35 -0000 1.10.2.1 --- newmember.tmpl 6 Feb 2004 14:10:06 -0000 1.10.2.2 *************** *** 32,36 **** ! Card Number --- 32,36 ---- ! Card number *************** *** 85,89 **** ! Date Of Birth --- 85,89 ---- ! Date of birth *************** *** 230,237 ****

The following fields have a forbidden value. Please push the back button and try again :

! Cardnumber
! Invalid_cardnumber
--- 230,237 ----

The following fields have a forbidden value. Please push the back button and try again :

! Card number
! Invalid cardnumber
Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-main.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- opac-main.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 1,134 **** ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
! ! ! ! ! !
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

! Koha: Horowhenua Library Trust Catalogue and Member Services		Search the Catalogue
   
! !
! ! Type in the box and press the enter key.
! ! ! -Advanced Search (More Options)
! ! !

! !

Logged in as: [Log Out]

! !

Log In to Koha

! !
! !
!

!

--- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
! ! ! ! ! !
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

! Koha: Horowhenua Library Trust Catalogue and Member Services		Search the Catalogue
   
! !
! ! Type in the box and press the enter key.
! ! ! -Advanced Search (More Options)
! ! !

! !

Logged in as: [Log Out]

! !

Log In to Koha

! !
! !
!

!

Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -r1.10.2.1 -r1.10.2.2 *** request.tmpl 26 Jan 2004 10:46:35 -0000 1.10.2.1 --- request.tmpl 6 Feb 2004 14:10:06 -0000 1.10.2.2 *************** *** 45,49 **** /images/background-mem.gif">Request ! /images/background-mem.gif">Item Type /images/background-mem.gif">Classification /images/background-mem.gif">Volume --- 45,49 ---- /images/background-mem.gif">Request ! /images/background-mem.gif">Item type /images/background-mem.gif">Classification /images/background-mem.gif">Volume *************** *** 142,149 **** ! Next Available ! This type only : --- 142,149 ---- ! Next Available ! This type only : *************** *** 155,160 **** ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> --- 155,161 ---- ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> ! Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** shelves.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- shelves.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 1,41 **** -

Logged in as: [Log Out]

- - !
!
! Shelf List

! ! - - - !
! ! !
Add a book by barcode:
!
! ! !
"> ! Contents of shelf !
!
">">" width=10 align=center> ">" width=10 align=center> ">" width=10 align=center> ">
!
! "> ! ! "> ! !

--- 1,47 ---- !
!
! ! ! ! !
"> ! Contents of !
">"> "> "> ">
!
! Shelf list ! "> ! ! "> ! !
!
! "> ! ! "> ! ! ! ! ! !
! Add a book by barcode in : ! ! ! ! "> ! !
!
*************** *** 49,102 ****
- Modify Shelf Contents

Bookshelves

!
!
! ! ! ! ! ! ! ! !
"> ! Select Shelves to Delete !
"> ! "> ! ( books) !
!

!

! ! !

Add Shelf:

!

! !

! !
"> ! ! !
"> ! Shelf List !
!
"> "> ( books) !
!

Add or Remove Book Shelves - ! ! \ No newline at end of file --- 55,139 ----

Bookshelves

! ! ! ! ! !
!
!

! Shelf list !

!
! 		!
! ! ! ! ! ! ! ! ! ! !
"> ! Select Shelves to Delete !
"> ! "> ! ( books) !
!

!

!

! 		!
! ! ! ! ! ! ! ! !
"> ! Add Shelf !
!

!
!

!
!
! ! ! ! ! !
"> ! ! ! ! !
"> ! Shelf List !
!
"> "> ( books) !
!

! Add or Remove Book Shelves !

! From tipaul at users.sourceforge.net Fri Feb 6 15:12:06 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport AcceptItemCopy.tmpl,1.3,1.3.2.1 marcimportdetail.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/koha-tmpl/intranet-tmpl/default/en/marcimport Modified Files: Tag: rel_2_0 AcceptItemCopy.tmpl marcimportdetail.tmpl Log Message: template fixes for translation Index: AcceptItemCopy.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** AcceptItemCopy.tmpl 9 Dec 2003 10:29:03 -0000 1.3 --- AcceptItemCopy.tmpl 6 Feb 2004 14:12:04 -0000 1.3.2.1 *************** *** 2,6 ****
! Barcode '' has already been assigned.

--- 2,6 ----

! Barcode has already been assigned.

Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** marcimportdetail.tmpl 9 Dec 2003 10:29:03 -0000 1.3 --- marcimportdetail.tmpl 6 Feb 2004 14:12:04 -0000 1.3.2.1 *************** *** 25,29 **** Subject" size=40 maxlenght=255> Notes" size=40 maxlenght=255> ! Item Type ISBN" size=40 maxlenght=40> ISSN" size=40 maxlenght=40> --- 25,29 ---- Subject" size=40 maxlenght=255> Notes" size=40 maxlenght=255> ! Item type ISBN" size=40 maxlenght=40> ISSN" size=40 maxlenght=40> From tipaul at users.sourceforge.net Fri Feb 6 15:12:06 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members imemberentry.tmpl,1.6,1.6.2.1 jmemberentry.tmpl,1.7,1.7.2.1 memberentry.tmpl,1.21.2.1,1.21.2.2 member-password.tmpl,1.5,1.5.2.1 member.tmpl,1.8,1.8.2.1 moremember.tmpl,1.23.2.2,1.23.2.3 readingrec.tmpl,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/koha-tmpl/intranet-tmpl/default/en/members Modified Files: Tag: rel_2_0 imemberentry.tmpl jmemberentry.tmpl memberentry.tmpl member-password.tmpl member.tmpl moremember.tmpl readingrec.tmpl Log Message: template fixes for translation Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** imemberentry.tmpl 9 Dec 2003 10:29:02 -0000 1.6 --- imemberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.6.2.1 *************** *** 22,26 **** ! Member# , Card Number* >
--- 22,26 ---- ! Member# , Card number* >
Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** jmemberentry.tmpl 9 Dec 2003 10:29:02 -0000 1.7 --- jmemberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.7.2.1 *************** *** 53,57 **** ! Member# , Card Number* --- 53,57 ---- ! Member# , Card number* Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -C2 -r1.21.2.1 -r1.21.2.2 *** memberentry.tmpl 26 Jan 2004 10:46:35 -0000 1.21.2.1 --- memberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.21.2.2 *************** *** 1,11 **** -

! Add Member Update Member Details !


--- 1,14 ---- !

! Add member !

+

Update Member Details +

!
*************** *** 20,24 **** ! Member# , Card Number*
--- 23,27 ---- ! Member# , Card number*
Index: member-password.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** member-password.tmpl 9 Dec 2003 10:29:03 -0000 1.5 --- member-password.tmpl 6 Feb 2004 14:12:04 -0000 1.5.2.1 *************** *** 16,20 **** New Password: >

!

--- 16,20 ---- New Password: >

! Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** member.tmpl 9 Dec 2003 10:29:03 -0000 1.8 --- member.tmpl 6 Feb 2004 14:12:04 -0000 1.8.2.1 *************** *** 42,46 ****

! Adult Organisation --- 42,46 ---- ! Adult Organisation Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v retrieving revision 1.23.2.2 retrieving revision 1.23.2.3 diff -C2 -r1.23.2.2 -r1.23.2.3 *** moremember.tmpl 26 Jan 2004 10:46:35 -0000 1.23.2.2 --- moremember.tmpl 6 Feb 2004 14:12:04 -0000 1.23.2.3 *************** *** 15,19 **** (, )

! Card Number:
Postal Address: ,
Home Address: ,
--- 15,19 ---- (, )

! Card number:
Postal Address: ,
Home Address: ,
Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** readingrec.tmpl 22 Dec 2003 10:56:19 -0000 1.7.2.1 --- readingrec.tmpl 6 Feb 2004 14:12:04 -0000 1.7.2.2 *************** *** 3,7 ****


Member Number: !
Card Number:

--- 3,7 ----


Member Number: !
Card number:

From tipaul at users.sourceforge.net Fri Feb 6 15:12:31 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbudget.tmpl,1.20,1.20.2.1 authorised_values.tmpl,1.17,1.17.2.1 branches.tmpl,1.18,1.18.2.1 categorie.tmpl,1.15,1.15.2.1 categoryitem.tmpl,1.7,1.7.2.1 charges.tmpl,1.2,1.2.2.1 currency.tmpl,1.7,1.7.2.1 itemtypes.tmpl,1.14.2.1,1.14.2.2 koha2marclinks.tmpl,1.9,1.9.2.1 marc_subfields_structure.tmpl,1.23.2.1,1.23.2.2 printers.tmpl,1.8,1.8.2.1 thesaurus.tmpl,1.17.2.1,1.17.2.2 z3950servers.tmpl,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8520/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: Tag: rel_2_0 aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl printers.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: template fixes for translation Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -r1.20 -r1.20.2.1 *** aqbudget.tmpl 9 Dec 2003 10:29:00 -0000 1.20 --- aqbudget.tmpl 6 Feb 2004 14:12:26 -0000 1.20.2.1 *************** *** 92,97 **** ! Start date ()  ! End date () Budget amount  "> --- 92,97 ---- ! Start date ()  ! End date () Budget amount  "> Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -r1.17 -r1.17.2.1 *** authorised_values.tmpl 9 Dec 2003 10:29:00 -0000 1.17 --- authorised_values.tmpl 6 Feb 2004 14:12:27 -0000 1.17.2.1 *************** *** 51,56 ****

Authorised values admin

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.

!

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 subfield is not entered through a free field, but though a list of authorised values.

New category... --- 51,55 ----

Authorised values admin

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.

!

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 subfield is not entered through a free field, but though a list of authorised values.

New category... Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -r1.18 -r1.18.2.1 *** branches.tmpl 9 Dec 2003 10:29:00 -0000 1.18 --- branches.tmpl 6 Feb 2004 14:12:27 -0000 1.18.2.1 *************** *** 2,5 **** --- 2,6 ---- +


*************** *** 57,61 ****   ! --- 58,62 ----   ! *************** *** 127,131 **** ! --- 128,132 ---- ! Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -r1.15 -r1.15.2.1 *** categorie.tmpl 9 Dec 2003 10:29:00 -0000 1.15 --- categorie.tmpl 6 Feb 2004 14:12:27 -0000 1.15.2.1 *************** *** 194,201 **** - Bulk - - - Enrollment fee --- 194,197 ---- *************** *** 238,242 **** Data deleted !
--- 234,238 ---- Data deleted !
*************** *** 247,270 ****

Category admin

! You Searched for !
! > !
! ! - - ! --- 243,265 ----

Category admin

! You Searched for ! ! > ! !
Category DescriptionEnrollment Upper Age Limit Age Required FineBulkFee OverdueIssue Limit Reserve
! ! ! *************** *** 276,285 **** ! ! ! --- 271,284 ---- + ! *************** *** 292,296 ****

!

--- 291,295 ----

!

Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** categoryitem.tmpl 9 Dec 2003 10:29:00 -0000 1.7 --- categoryitem.tmpl 6 Feb 2004 14:12:27 -0000 1.7.2.1 *************** *** 269,273 **** ! --- 269,273 ---- ! *************** *** 294,298 ****

!

--- 294,298 ----

!

Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** charges.tmpl 9 Dec 2003 10:29:00 -0000 1.2 --- charges.tmpl 6 Feb 2004 14:12:27 -0000 1.2.2.1 *************** *** 2,8 ****

Each box needs to be filled in with fine,time to start charging,charging cycle
! eg 1,7,7 = $1 fine, after 7 days, every 7 days

!

Note : fines are calculated by the fines2.pl script, located in misc directory. ! Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

--- 2,7 ----

Each box needs to be filled in with fine,time to start charging,charging cycle
! eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

!

Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** currency.tmpl 9 Dec 2003 10:29:00 -0000 1.7 --- currency.tmpl 6 Feb 2004 14:12:27 -0000 1.7.2.1 *************** *** 182,187 **** ! ! --- 182,187 ---- ! ! *************** *** 202,206 ****
!
--- 202,206 ----
!
Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -r1.14.2.1 -r1.14.2.2 *** itemtypes.tmpl 12 Jan 2004 19:20:33 -0000 1.14.2.1 --- itemtypes.tmpl 6 Feb 2004 14:12:27 -0000 1.14.2.2 *************** *** 81,90 **** ! ! --- 81,99 ---- ! ! *************** *** 157,161 **** --- 166,170 ---- Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** koha2marclinks.tmpl 9 Dec 2003 10:29:01 -0000 1.9 --- koha2marclinks.tmpl 6 Feb 2004 14:12:27 -0000 1.9.2.1 *************** *** 164,168 ****
Category DescriptionEnrollment periodEnrollment fee Upper Age Limit Age Required Fine OverdueIssue limit Reserve YesNo ! Yes ! ! No ! ! Fee OverdueIssue Limit Reserve Fee OverdueIssue limit Reserve
EditDelete
EditDelete
Not for loanchecked value=1> (if checked, no item of this type can be issued. ! If not checked, every item of this type can be issued unless notforloan is set for a specific item)
Loan length (meaningful only if not for loan is not set)
Not for loan ! ! ! ! ! ! if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item !
Loan length ! ! meaningful only if not for loan is not set !
! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
! --- 164,168 ----
koha field ? Tag Subfield
! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -C2 -r1.23.2.1 -r1.23.2.2 *** marc_subfields_structure.tmpl 20 Jan 2004 10:23:30 -0000 1.23.2.1 --- marc_subfields_structure.tmpl 6 Feb 2004 14:12:27 -0000 1.23.2.2 *************** *** 68,75 **** ! MARC subfield structure admin for !

This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit".

!

The column Koha field shows that the subfield is linked with a "Koha field". Koha can manage a MARC interface, or a Koha interface. This link ensures that ! both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

Koha field ? Tag Subfield
--- 68,74 ---- !

MARC subfield structure admin for

!

This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

!

The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

*************** *** 77,81 **** ! --- 76,80 ---- ! Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** printers.tmpl 9 Dec 2003 10:29:01 -0000 1.8 --- printers.tmpl 6 Feb 2004 14:12:27 -0000 1.8.2.1 *************** *** 195,199 ****
!
--- 195,199 ----
!
Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -r1.17.2.1 -r1.17.2.2 *** thesaurus.tmpl 26 Jan 2004 10:46:35 -0000 1.17.2.1 --- thesaurus.tmpl 6 Feb 2004 14:12:27 -0000 1.17.2.2 *************** *** 99,103 ****

Manages thesaurus and authorities files.

    ! Dig: see data dependent one this one
    Related: see other forms of this authority entry

--- 99,103 ----

Manages thesaurus and authorities files.

    ! Dig: see data depending of this one
    Related: see other forms of this authority entry

*************** *** 125,129 **** ! --- 125,129 ---- ! Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** z3950servers.tmpl 9 Dec 2003 10:29:02 -0000 1.11 --- z3950servers.tmpl 6 Feb 2004 14:12:27 -0000 1.11.2.1 *************** *** 74,78 ****

Modify Z39.50 Server

!

Add Z39.50 Server

--- 74,78 ----

Modify Z39.50 Server

!

Add Z39.50 server

*************** *** 280,284 ****
!
--- 280,284 ----
!
From tipaul at users.sourceforge.net Fri Feb 6 15:13:03 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:13:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc search.tmpl,1.9.2.2,1.9.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8704/koha-tmpl/intranet-tmpl/default/en/search.marc Modified Files: Tag: rel_2_0 search.tmpl Log Message: template fixes for translation Index: search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -r1.9.2.2 -r1.9.2.3 *** search.tmpl 26 Jan 2004 10:46:35 -0000 1.9.2.2 --- search.tmpl 6 Feb 2004 14:12:45 -0000 1.9.2.3 *************** *** 5,9 **** ! MARC Search
--- 5,9 ---- ! MARC search
*************** *** 14,25 **** "> !
Subfield Libkoha field ? Rep ? Mand ?Subfield LibKoha field ? Rep ? Mand ? Dig Related ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> Dig   Related ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
! !
HELP :
--- 14,25 ---- "> ! ! ! ! --- 28,33 ---- !
HELP :
*************** *** 28,32 ****
! From tipaul at users.sourceforge.net Fri Feb 6 15:14:02 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:14:02 -0800 Subject: [Koha-cvs] CVS: koha/acqui order.pl,1.9,1.9.2.1 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8988/acqui Modified Files: Tag: rel_2_0 order.pl Log Message: managing active/inactive suppliers. user can't create an order on an inactive supplier Index: order.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/order.pl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** order.pl 8 Jul 2003 16:20:15 -0000 1.9 --- order.pl 6 Feb 2004 14:13:59 -0000 1.9.2.1 *************** *** 64,67 **** --- 64,68 ---- $line{id} =$suppliers[$i]->{'id'}; $line{name} = $suppliers[$i]->{'name'}; + $line{active} = $suppliers[$i]->{'active'}; $line{total} = $orders->[0]->{'count(*)'}; $line{authorisedby} = $orders->[0]->{'authorisedby'}; From tipaul at users.sourceforge.net Fri Feb 6 15:15:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:15:10 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.32.2.4,1.32.2.5 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.pl Log Message: indicators are back... they were stored but now shown on screen Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.32.2.4 retrieving revision 1.32.2.5 diff -C2 -r1.32.2.4 -r1.32.2.5 *** addbiblio.pl 26 Jan 2004 10:34:53 -0000 1.32.2.4 --- addbiblio.pl 6 Feb 2004 14:14:55 -0000 1.32.2.5 *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $indicator; $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 240,244 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); From tipaul at users.sourceforge.net Fri Feb 6 15:16:57 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:16:57 -0800 Subject: [Koha-cvs] CVS: koha/C4 BookShelves.pm,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9794/C4 Modified Files: Tag: rel_2_0 BookShelves.pm Log Message: fixing bugs in bookshelves management. Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** BookShelves.pm 15 Dec 2003 10:57:08 -0000 1.11 --- BookShelves.pm 6 Feb 2004 14:16:55 -0000 1.11.2.1 *************** *** 145,163 **** #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! my $sth=$dbh->prepare("select * from shelfcontents ! where shelfnumber=? and itemnumber=?"); ! ! $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents ! (shelfnumber, itemnumber, flags) values (?, ?, 0)"); - # FIXME - The default for 'flags' is NULL. - # Why set it to 0? $sth->execute($shelfnumber, $itemnumber); ! } } --- 145,159 ---- #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! return unless $itemnumber; ! my $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); ! $sth->execute($shelfnumber, $itemnumber); ! } } *************** *** 244,247 **** --- 240,246 ---- # # $Log$ + # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.11 2003/12/15 10:57:08 slef # DBI call fix for bug 662 From tipaul at users.sourceforge.net Fri Feb 6 15:15:58 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:15:58 -0800 Subject: [Koha-cvs] CVS: koha/C4 Authorities.pm,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9512/C4 Modified Files: Tag: rel_2_0 Authorities.pm Log Message: modifying order (mysql auto sort by relevance) Index: Authorities.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Authorities.pm,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** Authorities.pm 26 Jan 2004 10:36:42 -0000 1.7.2.1 --- Authorities.pm 6 Feb 2004 14:15:56 -0000 1.7.2.2 *************** *** 193,199 **** } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " order by category,freelib limit ?,?"; push(@bind,$offset,($pagesize*4)); ! # warn "q : $query"; my $sth=$dbh->prepare($query); $sth->execute(@bind); --- 193,199 ---- } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " limit ?,?"; push(@bind,$offset,($pagesize*4)); ! warn "q : $query". at bind; my $sth=$dbh->prepare($query); $sth->execute(@bind); From tipaul at users.sourceforge.net Fri Feb 6 15:22:25 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:22:25 -0800 Subject: [Koha-cvs] CVS: koha shelves.pl,1.12,1.12.2.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11270 Modified Files: Tag: rel_2_0 shelves.pl Log Message: fixing bugs in bookshelves management. Index: shelves.pl =================================================================== RCS file: /cvsroot/koha/koha/shelves.pl,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** shelves.pl 5 Feb 2003 10:04:14 -0000 1.12 --- shelves.pl 6 Feb 2004 14:22:19 -0000 1.12.2.1 *************** *** 5,10 **** # $Header$ # - - # Copyright 2000-2002 Katipo Communications # --- 5,8 ---- *************** *** 36,40 **** my $env; my $query = new CGI; - #print $query->header(-cookie => $cookie); my $headerbackgroundcolor='#663266'; my $circbackgroundcolor='#555555'; --- 34,37 ---- *************** *** 45,83 **** = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {parameters => 1}, ! }); ! #print startpage(); ! #print startmenu('catalogue'); ! #print "

Logged in as: $loggedinuser [Log Out]

\n"; ! ! ! my ($shelflist) = GetShelfList(); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); } - } } SWITCH: { ! $template->param({ loggedinuser => $loggedinuser, ! viewshelf => $query->param('viewshelf'), ! shelves => $query->param('shelves'), ! headerbackgroundcolor => $headerbackgroundcolor, ! circbackgroundcolor => $circbackgroundcolor }); ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 42,77 ---- = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {catalogue => 1}, ! }); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); ! } } } + my ($shelflist) = GetShelfList(); + $template->param({ loggedinuser => $loggedinuser, + headerbackgroundcolor => $headerbackgroundcolor, + circbackgroundcolor => $circbackgroundcolor }); SWITCH: { ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! } ! ! ($shelflist) = GetShelfList(); # rebuild shelflist in case a shelf has been added ! ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 87,106 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); - } - $template->param(shelvesloop => \@shelvesloop); } output_html_with_http_headers $query, $cookie, $template->output; - sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); } - } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { --- 81,98 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); } + $template->param(shelvesloop => \@shelvesloop); output_html_with_http_headers $query, $cookie, $template->output; sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); ! } } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { *************** *** 114,123 **** #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 106,115 ---- #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 127,143 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop); } - - sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 119,135 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop, ! shelves => 1, ! ); } sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 148,162 **** $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop); ! $template->param( shelfname => $shelflist->{$shelfnumber}->{'shelfname'}); ! $template->param( shelfnumber => $shelfnumber); } - #print endpage(); - #print endmenu('catalogue'); - # # $Log$ # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains --- 140,156 ---- $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop, ! shelfname => $shelflist->{$shelfnumber}->{'shelfname'}, ! shelfnumber => $shelfnumber, ! viewshelf => $query->param('viewshelf'), ! ); } # # $Log$ + # Revision 1.12.2.1 2004/02/06 14:22:19 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains From tipaul at users.sourceforge.net Fri Feb 6 15:21:56 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:21:56 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.85.2.3,1.85.2.4 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11122/C4 Modified Files: Tag: rel_2_0 Search.pm Log Message: bugfix for subject search. Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85.2.3 retrieving revision 1.85.2.4 diff -C2 -r1.85.2.3 -r1.85.2.4 *** Search.pm 26 Jan 2004 10:39:16 -0000 1.85.2.3 --- Search.pm 6 Feb 2004 14:21:54 -0000 1.85.2.4 *************** *** 1146,1150 **** } else { if ($type eq 'subject'){ ! $query .= "group by subject order by subject "; } } --- 1146,1150 ---- } else { if ($type eq 'subject'){ ! $query .= "order by subject group by subject "; } } From acli at users.sourceforge.net Tue Feb 10 01:43:24 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 16:43:24 -0800 Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.45,1.46 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4553 Modified Files: Output.pm Log Message: This allows the user to type zh_TW and still get Chinese from the zh-TW directory. Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** Output.pm 2 Dec 2003 22:13:25 -0000 1.45 --- Output.pm 10 Feb 2004 00:43:21 -0000 1.46 *************** *** 130,137 **** foreach my $th (@themes) { foreach my $la (@languages) { ! if (-e "$htdocs/$th/$la/$tmpl") { ! $theme = $th; ! $lang = $la; ! last THEME; } } --- 130,141 ---- foreach my $th (@themes) { foreach my $la (@languages) { ! for (my $pass = 1; $pass <= 2; $pass += 1) { ! $la =~ s/([-_])/ $1 eq '-'? '_': '-' /eg if $pass == 2; ! if (-e "$htdocs/$th/$la/$tmpl") { ! $theme = $th; ! $lang = $la; ! last THEME; ! } ! last unless $la =~ /[-_]/; } } From acli at users.sourceforge.net Tue Feb 10 00:34:10 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 15:34:10 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21182 Modified Files: tmpl_process.pl Log Message: Minor spelling correction. Don't proceed if the user specified an unknown option. Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** tmpl_process.pl 9 Dec 2003 10:26:51 -0000 1.5 --- tmpl_process.pl 9 Feb 2004 23:34:08 -0000 1.6 *************** *** 19,23 **** 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help); help() if $help; --- 19,24 ---- 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help, ! ) || (usage(), exit(-1)); help() if $help; *************** *** 42,46 **** if( !(-d $in_files[0]) && !(-f $in_files[0])) { ! usage("Unknow input. Input must a file or a directory. (Symbolic links are not supported for the moment)."); } elsif( -d $in_files[0] ) --- 43,47 ---- if( !(-d $in_files[0]) && !(-f $in_files[0])) { ! usage("Unknown input. Input must a file or a directory. (Symbolic links are not supported for the moment.)"); } elsif( -d $in_files[0] ) From acli at users.sourceforge.net Tue Feb 10 01:58:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 16:58:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8108/parameters Modified Files: admin-home.tmpl Log Message: Spelling mistake Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** admin-home.tmpl 9 Dec 2003 13:46:28 -0000 1.25 --- admin-home.tmpl 10 Feb 2004 00:58:49 -0000 1.26 *************** *** 11,15 **** ! --- 11,15 ---- ! From acli at users.sourceforge.net Mon Feb 9 23:36:35 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 14:36:35 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.70,1.71 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4855/misc Modified Files: Install.pm Log Message: Fix of bug 711, "No message named WhereisMySQL in Install.pm". Added defined() check for "Use of uninitialized value in -e at Install.pm line 2085, line 32." Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -r1.70 -r1.71 *** Install.pm 22 Dec 2003 19:16:58 -0000 1.70 --- Install.pm 9 Feb 2004 22:36:32 -0000 1.71 *************** *** 998,1002 **** if (!$mysqldir){ for (;;) { ! $mysqldir = showmessage(getmessage('WhereisMySQL'),'free'); last if -f "$mysqldir/bin/mysqladmin"; } --- 998,1002 ---- if (!$mysqldir){ for (;;) { ! $mysqldir = showmessage(getmessage('WhereIsMySQL'),'free'); last if -f "$mysqldir/bin/mysqladmin"; } *************** *** 2080,2087 **** sub restoremycnf { ! if (-e $mycnf) { unlink($mycnf); } ! if (-e $mytmpcnf) { rename $mytmpcnf,$mycnf; } --- 2080,2087 ---- sub restoremycnf { ! if (defined $mycnf && -e $mycnf) { unlink($mycnf); } ! if (defined $mytmpcnf && -e $mytmpcnf) { rename $mytmpcnf,$mycnf; } From acli at users.sourceforge.net Tue Feb 10 03:53:24 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 18:53:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28881/includes Modified Files: common-style.css Log Message: We can't use A.home, A.about, etc. for Chinese, otherwise the padding will cause the links to become very ugly; this is better. (It is probably better for other translations as well...) Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** common-style.css 16 Jul 2003 06:37:46 -0000 1.1 --- common-style.css 10 Feb 2004 02:53:09 -0000 1.2 *************** *** 39,51 **** } ! a.home { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.home:hover { background-color: #339933; color: #000000; --- 39,57 ---- } ! /* ! * We can't use a.home, etc. for Chinese. ! * Otherwise the screen will be extremely ugly because of the padding ! */ ! td.home { ! padding:4px; ! } ! td.home a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.home a:hover { background-color: #339933; color: #000000; *************** *** 55,68 **** } ! a.catalogue { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; margin:0; } ! a.catalogue:hover { font-weight: normal; text-decoration: none; --- 61,76 ---- } ! td.catalogue { ! padding:4px; ! } ! td.catalogue a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; margin:0; } ! td.catalogue a:hover { font-weight: normal; text-decoration: none; *************** *** 73,85 **** } ! a.members { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.members:hover { background-color: #86c268; color: #000000; --- 81,95 ---- } ! td.members { ! padding:4px; ! } ! td.members a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.members a:hover { background-color: #86c268; color: #000000; *************** *** 88,100 **** } ! a.acquisition { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.acquisition:hover { background-color: #ffdf61; color: #000000; --- 98,112 ---- } ! td.acquisition { ! padding:4px; ! } ! td.acquisition a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.acquisition a:hover { background-color: #ffdf61; color: #000000; *************** *** 103,115 **** } ! a.reports { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.reports:hover { background-color: #6b7cbe; color: #000000; --- 115,129 ---- } ! td.reports { ! padding:4px; ! } ! td.reports a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.reports a:hover { background-color: #6b7cbe; color: #000000; *************** *** 118,130 **** } ! a.circulation { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.circulation:hover { background-color: #be6170; color: #000000; --- 132,146 ---- } ! td.circulation { ! padding:4px; ! } ! td.circulation a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.circulation a:hover { background-color: #be6170; color: #000000; *************** *** 133,145 **** } ! a.parameters { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.parameters:hover { background-color: #86c268; color: #000000; --- 149,163 ---- } ! td.parameters { ! padding:4px; ! } ! td.parameters a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.parameters a:hover { background-color: #86c268; color: #000000; *************** *** 147,159 **** font-weight: bold; } ! a.about { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.about:hover { background-color: #86c268; color: #000000; --- 165,180 ---- font-weight: bold; } ! ! td.about { ! padding:4px; ! } ! td.about a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.about a:hover { background-color: #86c268; color: #000000; From acli at users.sourceforge.net Tue Feb 10 03:55:03 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 18:55:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269/includes Modified Files: common-style.css Log Message: Sync to en/include/common-style.css Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** common-style.css 10 Feb 2004 02:53:09 -0000 1.2 --- common-style.css 10 Feb 2004 02:55:01 -0000 1.3 *************** *** 14,17 **** --- 14,21 ---- } + #problem { + color: red; + font-weight:bold; + } #menubar { border-top:1px solid #666666; *************** *** 29,32 **** --- 33,47 ---- cursor: hand; color:#777777; + background-color:#EEEEEE; + padding:4px; + font-weight: bold; + margin:0; + } + a.submenu2 { + font-weight: normal; + text-decoration: none; + cursor: hand; + color:#777777; + background-color:#CCCCCC; padding:4px; font-weight: bold; From acli at users.sourceforge.net Tue Feb 10 04:00:39 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:00:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30007/includes Modified Files: parameters-top.inc Log Message: Changed DTD declaration so that Mozilla will use standards mode for this. Use more standard translation for "About" Minor updates Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** parameters-top.inc 16 Jul 2003 08:10:33 -0000 1.3 --- parameters-top.inc 10 Feb 2004 03:00:37 -0000 1.4 *************** *** 1,3 **** ! --- 1,3 ---- ! *************** *** 36,66 **** --- 60,64 ---- *************** *** 86,95 **** --- 70,79 ---- From acli at users.sourceforge.net Tue Feb 10 04:00:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:00:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-bottom.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30203/includes Modified Files: parameters-bottom.inc Log Message: Use more standard translation for "About" Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** parameters-bottom.inc 16 Jul 2003 04:52:13 -0000 1.2 --- parameters-bottom.inc 10 Feb 2004 03:00:50 -0000 1.3 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! ¦³ÃöKoha || Help --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || Help From acli at users.sourceforge.net Tue Feb 10 04:01:02 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:01:02 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes acquisitions-top.inc,1.1,1.2 cat-top.inc,1.1,1.2 circulation-top.inc,1.1,1.2 issues-top.inc,1.1,1.2 members-top.inc,1.1,1.2 opac-top.inc,1.1,1.2 reports-top.inc,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30227/includes Modified Files: acquisitions-top.inc cat-top.inc circulation-top.inc issues-top.inc members-top.inc opac-top.inc reports-top.inc Log Message: Changed DTD declaration so that Mozilla will use standards mode for this. Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/acquisitions-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquisitions-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- acquisitions-top.inc 10 Feb 2004 03:00:59 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/cat-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cat-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- cat-top.inc 10 Feb 2004 03:00:59 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/circulation-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- circulation-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/issues-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** issues-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- issues-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/members-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** members-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- members-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/opac-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- opac-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/reports-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reports-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- reports-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! From acli at users.sourceforge.net Tue Feb 10 04:01:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:01:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30355/parameters Modified Files: admin-home.tmpl Log Message: Sync to en Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** admin-home.tmpl 6 Feb 2003 06:37:47 -0000 1.3 --- admin-home.tmpl 10 Feb 2004 03:01:36 -0000 1.4 *************** *** 1,87 **** - - -

±z¥Ø«eµn¤J¬°: [µn¥X]

- -

µn¤J Koha

-
! Kohaªº¨t²Î³]©w
!
Library branchesThe differents branches you manage with this Koha server.
 
Library branchesThe different branches you manage with this Koha server.
 
!
¨t²Î°Ñ¼Æ
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
®Ñ¥Ø¬ÛÃö³]©w
À]ÂÃÃþ§O¦UºØÀ]Â꺤ÀÃþ
°]¬F¹wºâthe budgets allowed to differents book funds.
book fundsthe differents book funds.
®e³\­È³]©w®e³\­ÈªºÃþ§O¤Î¬ÛÃöªº®e³\­È¡C ! ¦b¾÷Ū®æ¦¡µ²ºcªº³]©w¸Ì¡A¥i«ü©w¬Y¨Ç¤ÀÄæ¥u¯à¥Î¬Y¨Ç¡u®e³\­È¡v¡A¥O¿é¤J®Ñ¥Ø®É¥i¥H´î¤Ö¿ù»~©Î§ó¥[¤è«K
ThesaurusThesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
¾÷Ū®æ¦¡ (MARC) ¬ÛÃö³]©w
©w¸q¾÷Ū®æ¦¡ªºµ²ºc¾÷Ū®æ¦¡ªºµ²ºc¡GÄæ¤Î¤ÀÄæ
©w¸q¾÷Ū®æ¦¡©Mkoha¸ê®Æ®w¶¡ªº³sµ²©w¸qKoha¸ê®Æ®w©M¾÷Ū®æ¦¡¸ê®Æ®w¶¡ªºÃö«Y¡Cµù¡G¨Ï¥Î¡u©w¸q¾÷Ū®æ¦¡ªºµ²ºc¡v¥\¯à¤]¥i°µ¨ì³oÂI¡A¦ý¥Î³o­Ó¤u¨ã°µ³sµ²·|§Ö¤@¨Ç¡C
®Ö¹ï¾÷Ū®æ¦¡µ²ºc®Ö¹ê¾÷Ū®æ¦¡µ²ºcªº©w¸q¦³¨S¦³¾É­P¸ê®Æ®w¤£¯à¥¿±`¾Þ§@ªºÄY­«¿ù»~¡C³B²z¯u¥¿ªº¸ê®Æ«e¡A°È¥²¥Î³o­Ó®Ö¤@®Ö¹ï¡I
¨ä¥L°Ñ¼Æ
¤ÀÀ]³]©w³o®M Koha ¦øªA¾¹¥Ñ­þ¨Ç¹Ï®ÑÀ]¦@¥Î
ŪªÌÃþ§O³]©w¤£¦PªºÅªªÌÃþ§O
¹ô­È³]©w®ÑÂǨÑÀ³°Ó¥Î¤°»ò³f¹ô
¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|) ³]©w
stopword¬d¸ß®ÉÀ³¸Ó¬Ù²¤ªº¦r²´
Z39.50 ¦øªA¾¹¥Î¨Ó¬d¸ß¾÷Ū®æ¦¡¸ê®Æªº¦U¦øªA¾¹
¨t²Î°¾¦n¨ä¥L¼vÅT¨t²Î¹B§@ªº°¾¦n³]©w
! !
¬ÛÃö¤u¨ã
¶×¥X
MARC biblio export ¥H¾÷Ū®æ¦¡¶×¥X
--- 1,123 ----
!

³]©w

! !
¨t²Î°Ñ¼Æ
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + ! ! + ! ! + ! + ! ! ! ! + ! ! + + + + + + + ! + + ! ! + ! + ! + !
­nKoha¯à¥¿±`¹B§@¡A½Ð±z°È¥²¨Ì¦¸¶ñ§´¤U¦Cªº¦U¶µ³]©w
À]§O³]©w³o­ÓKoha¦øªA¾¹©Ò­t³dªº¦UÀ]
 
book fund¥Î¥HÁʸm®ÑÂǪº¦UºØ¸êª÷
 
³f¹ô¶×²v³]©w¶×²v
 
À]ÂÃÃþ§O³]©w¦UºØ¹Ï®Ñ¸ê®Æªº¤ÀÃþ
 
ŪªÌÃþ§O³]©wŪªÌªº¤ÀÃþ
 
»@´Ú³]©w¦UÃþŪªÌ­É¥X¦UÃþ¹Ï®Ñ¸ê®Æªº¦UºØ»@´Ú
 
®e³\­È³]©w®e³\­ÈªºÃþ§O¤Î¬ÛÃöªº®e³\­È¢w¢w­×§ï¾÷Ū®æ¦¡ªº®Ñ¥Ø®É¡A®e³\­È¥i¥HÅý­×§ï¾÷Ū®æ¦¡®É´î¤Ö¿ù»~¥H¤Î¸û¬°¤è«K
 
ThesaurusManagement of thesaurus and authorities files.
 
¾÷Ū®æ¦¡Äæ¦ìµ²ºc³]©w¾÷Ū®æ¦¡ªºÄæ¦ìµ²ºc (Äæ¤Î¤ÀÄæ)
 
³sµ²Koha¤Î¾÷Ū®æ¦¡¸ê®Æ®w©w¸qKoha¸ê®Æ®w©M¾÷Ū®æ¦¡¸ê®Æ®w¶¡ªºÃö«Y¡Cµù¡G¥u¥Î¡u¾÷Ū®æ¦¡Äæ¦ìµ²ºc¡v¥\¯à¤]¥i§¹¦¨³o­Ó¨BÆJ¡A¦ý¥Î³o­Ó¤u¨ã°µ³sµ²·|¸û§Ö¡C
 
®Ö¹ï¾÷Ū®æ¦¡µ²ºc®Ö¹ê¾÷Ū®æ¦¡µ²ºcªº©w¸q¦³¨S¦³¾É­P¸ê®Æ®w¤£¯à¥¿±`¾Þ§@ªºÄY­«¿ù»~¡C³B²z¯u¥¿ªº¸ê®Æ«e¡A°È¥²¥Î³o­Ó®Ö¤@®Ö¹ï¡I
 
¨ä¥L¦UºØ°Ñ¼Æ
 
¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|)
 
stopword³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
 
Z39.50 ¦øªA¾¹³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
 
¨t²Î°¾¦n³]©w¨t²Î°¾¦n
! !
¬ÛÃö¤u¨ã
+ + + + + + + + +
¶×¥X
MARC biblio export ¥H¾÷Ū®æ¦¡¶×¥X
¶×¤J
¤W¸ü¾÷Ū®æ¦¡°O¿ý¦Ü¡uBreeding Farm¡vThe breeding farm is a table where imported MARC records are + stored.
+ A MARC record is stored in the breeding farm as long as + you have no item. When you type the ISBN or title of a biblio, it's searched for + in the breeding farm. + If it is found, the biblio is added to Koha active table + and removed from the breeding farm.
+
From acli at users.sourceforge.net Tue Feb 10 04:08:02 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:08:02 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31600/parameters Modified Files: admin-home.tmpl Log Message: Minor improvements Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** admin-home.tmpl 10 Feb 2004 03:01:36 -0000 1.4 --- admin-home.tmpl 10 Feb 2004 03:08:00 -0000 1.5 *************** *** 9,22 **** ! ! ! --- 9,22 ----
­nKoha¯à¥¿±`¹B§@¡A½Ð±z°È¥²¨Ì¦¸¶ñ§´¤U¦Cªº¦U¶µ³]©w
À]§O³]©w³o­ÓKoha¦øªA¾¹©Ò­t³dªº¦UÀ]
 
book fund¥Î¥HÁʸm®ÑÂǪº¦UºØ¸êª÷
 
! ! ! *************** *** 38,42 **** ! --- 38,42 ---- ! *************** *** 47,52 **** ! ! --- 47,52 ---- ! ! *************** *** 110,115 **** ! ! ! ! ! ! --- 128,133 ---- ! ! *************** *** 135,142 ****
­nKoha¯à¥¿±`¹B§@¡A½Ð±z°È¥²¨Ì¦¸°µ¦n¤U¦Cªº¦U¶µ³]©w
À]§O³]©w³]©w³o­ÓKoha¦øªA¾¹©Ò­t³dªº¦UÀ]ªº¸ê®Æ
 
book fund³]©w¥Î¥HÁʸm®ÑÂǪº¦UºØ¸êª÷
 
»@´Ú³]©w¦UÃþŪªÌ­É¥X¦UÃþ¹Ï®Ñ¸ê®Æªº¦UºØ»@´Ú
 
»@´Ú³]©w³]©w¦UÃþŪªÌ­É¥X¦UÃþ¹Ï®Ñ¸ê®Æªº¦UºØ»@´Ú
 
 
ThesaurusManagement of thesaurus and authorities files.
 
 
ThesaurusManagement of thesaurus and authorities files.
 
¤W¸ü¾÷Ū®æ¦¡°O¿ý¦Ü¡uBreeding Farm¡vThe breeding farm is a table where imported MARC records are stored.
A MARC record is stored in the breeding farm as long as --- 110,115 ----
¤W¸ü¾÷Ū®æ¦¡°O¿ý¦Ü¡uBreeding Farm¡vThe breeding farm is a table where imported MARC records are stored.
A MARC record is stored in the breeding farm as long as From acli at users.sourceforge.net Tue Feb 10 04:13:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:13:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.26,1.27 systempreferences.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32491/parameters Modified Files: admin-home.tmpl systempreferences.tmpl Log Message: Various pedantic SGML syntax corrections (e.g., must contain a multiple of 4 hyphens) Inserted some blank rows in admin-home for visual consistency. Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** admin-home.tmpl 10 Feb 2004 00:58:49 -0000 1.26 --- admin-home.tmpl 10 Feb 2004 03:13:41 -0000 1.27 *************** *** 2,12 ****

Parameters


!
System parameters
! --- 2,14 ----

Parameters


!
Fill those tables in the order they appear to get a working Koha
Library branches
System parameters
! ! + *************** *** 18,21 **** --- 20,24 ---- + *************** *** 27,34 **** --- 30,39 ---- + + *************** *** 40,68 **** --- 45,84 ---- + + + + + + + + + + + *************** *** 75,90 ****
Fill those tables in the order they appear to get a working Koha
Library branchesBook fund administration. Remember to edit your book funds before you start editing the budgets.
 
CurrenciesDefine item types.
 
Borrower categories Define the categories of borrowers.
 
ChargesDefine categories and authorised values for them. Authorised values are used in MARC form to limit/help editing MARC biblios.
 
Thesaurus Management of thesaurus and authorities files.
 
MARC tag structure MARC structure: tags then subfields.
 
Links Koha - MARC DB Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.
 
MARC Check Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!
 
Various parameters
 
Printers Printers (UNIX paths).
 
Stop words Words deleted during searches.
 
Z39.50 Servers
!
Tools
! --- 91,110 ----
Export
MARC biblio export Exporting in MARC format.
Import
Upload MARC records in Breeding Farm
!
Tools
! ! + + + Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** systempreferences.tmpl 9 Dec 2003 10:29:02 -0000 1.18 --- systempreferences.tmpl 10 Feb 2004 03:13:41 -0000 1.19 *************** *** 56,60 **** !

Modify a system preference

--- 56,60 ---- !

Modify a system preference

*************** *** 78,82 **** ! Data recorded --- 78,82 ---- ! Data recorded *************** *** 86,90 **** !
Export
MARC biblio export Exporting in MARC format.
Import
Upload MARC records in Breeding Farm
--- 86,90 ---- !
*************** *** 101,105 **** ! Data deleted --- 101,105 ---- ! Data deleted *************** *** 108,112 **** !

System preferences admin

--- 108,112 ---- !

System preferences admin

From acli at users.sourceforge.net Tue Feb 10 04:13:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:13:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes parameters-top.inc,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32491/includes Modified Files: parameters-top.inc Log Message: Various pedantic SGML syntax corrections (e.g., must contain a multiple of 4 hyphens) Inserted some blank rows in admin-home for visual consistency. Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** parameters-top.inc 9 Dec 2003 10:29:04 -0000 1.18 --- parameters-top.inc 10 Feb 2004 03:13:41 -0000 1.19 *************** *** 35,39 **** !
Value
½T©w­n²¾°£¶Ü¡H
*************** *** 102,106 **** ! ¦¨¥\§R°£°Ñ¼Æ
--- 102,106 ---- ! ¦¨¥\²¾°£°Ñ¼Æ *************** *** 128,133 ****
">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
§ó§ï		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
§R°£
">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
­×§ï		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
²¾°£
! ! !
--- 135,142 ----
! ! !
From acli at users.sourceforge.net Tue Feb 10 05:57:22 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:57:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7,1.7.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19110 Modified Files: Tag: rel_2_0 about-top.inc Log Message: Spurious attribute in BODY removed Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** about-top.inc 9 Dec 2003 10:29:03 -0000 1.7 --- about-top.inc 10 Feb 2004 04:57:12 -0000 1.7.2.1 *************** *** 7,11 **** ! --- 7,11 ---- ! From acli at users.sourceforge.net Tue Feb 10 05:57:30 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:57:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19203/includes Modified Files: about-top.inc Log Message: Spurious attribute in BODY removed Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** about-top.inc 9 Dec 2003 10:29:03 -0000 1.7 --- about-top.inc 10 Feb 2004 04:57:27 -0000 1.8 *************** *** 7,11 **** ! --- 7,11 ---- ! From acli at users.sourceforge.net Tue Feb 10 05:59:04 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:59:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19434 Modified Files: Tag: rel_2_0 about-top.inc Log Message: Pedantic SGML syntax correction Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** about-top.inc 10 Feb 2004 04:57:12 -0000 1.7.2.1 --- about-top.inc 10 Feb 2004 04:59:01 -0000 1.7.2.2 *************** *** 33,37 **** ! !
--- 33,37 ----
!
From acli at users.sourceforge.net Tue Feb 10 05:59:12 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:59:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19568/includes Modified Files: about-top.inc Log Message: Pedantic SGML syntax correction Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** about-top.inc 10 Feb 2004 04:57:27 -0000 1.8 --- about-top.inc 10 Feb 2004 04:59:09 -0000 1.9 *************** *** 33,37 ****
! ! ! --- 128,133 ---- ! ! *************** *** 135,142 ****
--- 33,37 ----
! !
From acli at users.sourceforge.net Tue Feb 10 06:52:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:52:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27584/includes Modified Files: common-style.css Log Message: This makes the fonts look more like the English version Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** common-style.css 10 Feb 2004 02:55:01 -0000 1.3 --- common-style.css 10 Feb 2004 05:51:58 -0000 1.4 *************** *** 197,198 **** --- 197,210 ---- font-weight: bold; } + + /* Chinese-specific stuff below */ + *[lang=en], *[lang=fr], *[lang=de], *[lang=it], + *[lang=mi], *[lang=nl], *[lang=pl], + *.en { + font-family: Helvetica, Arial, sans-serif; + } + + body { + font-family: "Apple LiGothic Medium", "SimHei", "MS Gothic", "MS Hei", sans-serif; + } + From acli at users.sourceforge.net Tue Feb 10 06:56:35 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:56:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW about.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28094 Added Files: about.tmpl Log Message: New "About" templates from en Minor visual improvements to parameters-{top,bottom}.inc --- NEW FILE ---

¦³Ãö³o­ÓKohaª©¥»ªº¸ê®Æ (¥H«K³ø§i¿ù»~¡A¥H¤Î¨ä¥L¦³¥Îªº¸ê°T)¡G

Kohaª©¥»¡G
¾Þ§@¨t²Îª©¥» (uname -a)¡G
Perlª©¥»¡G
MySQLª©¥»¡G
Apacheª©¥»¡G
»ïÁ¡G

¥D­n¤H­û

¦uÅ@ªÌ Pat Eyler
2.0ª©¥Xª©¥D¥ô­Ý¾÷Ū®æ¦¡¶}µoªÌ Paul Poulain
¾÷Ū®æ¦¡¥\¯à¿Ä¸ê Joshua Ferraro ¤Î Nelsonville ¥«¥ß¹Ï®ÑÀ]
¦­´Á¾÷Ū®æ¦¡¶}µoªÌ¡BVirtual Bookshelf·§©À¡BKohaCD Steve Tonnesen
»¡©ú®Ñ½s¿è Nicholas Rosasco¡BMike Hansen
«~½èºÞ²z­Ý¦w¸Ë/¤É¯Åµ{¦¡½s¼gªÌ MJ Ray ¤Î Turo Technology LLP
ªk¤åĶªÌ Nicolas Morin
 Horowhenua Library Trust
¹Ï®ÑÀ]Á`ªø Rosalie Blake
Jo Ransom
Katipo Communications
Á`¸g²z­Ýºô¯¸ºÞ²z­û Rachel Hamilton-Williams
1.2ª©¥Xª©¥D¥ô Chris Cormack
¥H¤Î¡GSimon Blake¡B¹B§@¸g²zAmanda Atkins¡BOlwen Williams¡BFinlay Thompson¡BGynn Lomax¡BRichard Anderson¡BJeremy Blake¡BRebecca Holden¡BOlive T. Canine

¨ó§U

Adam Thick
Andrew Hooper
Al Banks
Ambrose Li
Andrew Arensburger
Benedykt P. Barszcz (2.0ª©ªiÄõ¤åĶªÌ)
Brig C. McCoy
Daniel Holth
David Strainchamps
Dorian Meid
 Ed Summers
Florian Bischof
Francisco M. Marzoa Alonso
Glen Stewart
Henri-Damien Laurent
Jérome Vizcaino (ESIEE¾Ç°|)
Kip DeGraaf
Marco Gaiarin
Md. Aftabuddin
Michaes Herman
 Michel Lerenard (ESIEE¾Ç°|)
Mike Johnson
Mike Mylonas
Pierre Cauchois (ESIEE¾Ç°|)
Pawel Skuza (1.2ª©ªiÄõ¤åĶªÌ)
Regula Sebastiao
Roger Buck
Ron Wickersham
Sebastiaan Durand
From acli at users.sourceforge.net Tue Feb 10 06:56:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:56:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,NONE,1.1 about-top.inc,NONE,1.1 parameters-bottom.inc,1.3,1.4 parameters-top.inc,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28094/includes Modified Files: parameters-bottom.inc parameters-top.inc Added Files: about-bottom.inc about-top.inc Log Message: New "About" templates from en Minor visual improvements to parameters-{top,bottom}.inc --- NEW FILE ---

 

ªð¦^¥D­¶ || À]Âìd¸ß || ŪªÌ±b¤á || ®ÑÂÇÁʸm || ¬y³qªA°È || ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || Ãö©óKoha || ½u¤W»¡©ú
--- NEW FILE --- KOHA: INTRANET: Parameters /includes/common-style.css">

¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

µn¤JKoha

Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** parameters-bottom.inc 10 Feb 2004 03:00:50 -0000 1.3 --- parameters-bottom.inc 10 Feb 2004 05:56:33 -0000 1.4 *************** *** 15,19 **** ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! Help --- 15,19 ---- ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! ½u¤W»¡©ú Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** parameters-top.inc 10 Feb 2004 03:19:52 -0000 1.5 --- parameters-top.inc 10 Feb 2004 05:56:33 -0000 1.6 *************** *** 7,15 **** /includes/common-style.css"> - + + *************** *** 87,91 ****
!

¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

µn¤JKoha

--- 90,94 ----
!

¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

µn¤JKoha

From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters systempreferences.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511/parameters Modified Files: Tag: rel_2_0 systempreferences.tmpl Log Message: Backport from trunk Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/systempreferences.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** systempreferences.tmpl 10 Feb 2004 04:22:01 -0000 1.3.2.1 --- systempreferences.tmpl 10 Feb 2004 05:57:14 -0000 1.3.2.2 *************** *** 58,62 **** !

§ó§ï¨t²Î°¾¦n

·s¼W¨t²Î°¾¦n

--- 58,62 ---- !

­×§ï¨t²Î°¾¦n

·s¼W¨t²Î°¾¦n

*************** *** 94,98 ****
!
Value
¯uªº­n§R°£¡H
--- 94,98 ----
Value
½T©w­n²¾°£¶Ü¡H
*************** *** 102,106 **** ! ¦¨¥\§R°£°Ñ¼Æ
--- 102,106 ---- ! ¦¨¥\²¾°£°Ñ¼Æ *************** *** 128,133 ****
">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
§ó§ï		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
§R°£
">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
­×§ï		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
²¾°£
! ! !
--- 135,142 ----
! ! !
From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW about.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511 Added Files: Tag: rel_2_0 about.tmpl Log Message: Backport from trunk --- NEW FILE ---

¦³Ãö³o­ÓKohaª©¥»ªº¸ê®Æ (¥H«K³ø§i¿ù»~¡A¥H¤Î¨ä¥L¦³¥Îªº¸ê°T)¡G

Kohaª©¥»¡G
¾Þ§@¨t²Îª©¥» (uname -a)¡G
Perlª©¥»¡G
MySQLª©¥»¡G
Apacheª©¥»¡G
»ïÁ¡G

¥D­n¤H­û

¦uÅ@ªÌ Pat Eyler
2.0ª©¥Xª©¥D¥ô­Ý¾÷Ū®æ¦¡¶}µoªÌ Paul Poulain
¾÷Ū®æ¦¡¥\¯à¿Ä¸ê Joshua Ferraro ¤Î Nelsonville ¥«¥ß¹Ï®ÑÀ]
¦­´Á¾÷Ū®æ¦¡¶}µoªÌ¡BVirtual Bookshelf·§©À¡BKohaCD Steve Tonnesen
»¡©ú®Ñ½s¿è Nicholas Rosasco¡BMike Hansen
«~½èºÞ²z­Ý¦w¸Ë/¤É¯Åµ{¦¡½s¼gªÌ MJ Ray ¤Î Turo Technology LLP
ªk¤åĶªÌ Nicolas Morin
 Horowhenua Library Trust
¹Ï®ÑÀ]Á`ªø Rosalie Blake
Jo Ransom
Katipo Communications
Á`¸g²z­Ýºô¯¸ºÞ²z­û Rachel Hamilton-Williams
1.2ª©¥Xª©¥D¥ô Chris Cormack
¥H¤Î¡GSimon Blake¡B¹B§@¸g²zAmanda Atkins¡BOlwen Williams¡BFinlay Thompson¡BGynn Lomax¡BRichard Anderson¡BJeremy Blake¡BRebecca Holden¡BOlive T. Canine

¨ó§U

Adam Thick
Andrew Hooper
Al Banks
Ambrose Li
Andrew Arensburger
Benedykt P. Barszcz (2.0ª©ªiÄõ¤åĶªÌ)
Brig C. McCoy
Daniel Holth
David Strainchamps
Dorian Meid
 Ed Summers
Florian Bischof
Francisco M. Marzoa Alonso
Glen Stewart
Henri-Damien Laurent
Jérome Vizcaino (ESIEE¾Ç°|)
Kip DeGraaf
Marco Gaiarin
Md. Aftabuddin
Michaes Herman
 Michel Lerenard (ESIEE¾Ç°|)
Mike Johnson
Mike Mylonas
Pierre Cauchois (ESIEE¾Ç°|)
Pawel Skuza (1.2ª©ªiÄõ¤åĶªÌ)
Regula Sebastiao
Roger Buck
Ron Wickersham
Sebastiaan Durand
From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,NONE,1.1.2.1 about-top.inc,NONE,1.1.2.1 common-style.css,1.1.2.1,1.1.2.2 parameters-bottom.inc,1.2.2.1,1.2.2.2 parameters-top.inc,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511/includes Modified Files: Tag: rel_2_0 common-style.css parameters-bottom.inc parameters-top.inc Added Files: Tag: rel_2_0 about-bottom.inc about-top.inc Log Message: Backport from trunk --- NEW FILE ---

 

ªð¦^¥D­¶ || À]Âìd¸ß || ŪªÌ±b¤á || ®ÑÂÇÁʸm || ¬y³qªA°È || ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || Ãö©óKoha || ½u¤W»¡©ú
--- NEW FILE --- KOHA: INTRANET: Parameters /includes/common-style.css">

¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

µn¤JKoha

Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** common-style.css 10 Feb 2004 04:18:48 -0000 1.1.2.1 --- common-style.css 10 Feb 2004 05:57:14 -0000 1.1.2.2 *************** *** 197,198 **** --- 197,210 ---- font-weight: bold; } + + /* Chinese-specific stuff below */ + *[lang=en], *[lang=fr], *[lang=de], *[lang=it], + *[lang=mi], *[lang=nl], *[lang=pl], + *.en { + font-family: Helvetica, Arial, sans-serif; + } + + body { + font-family: "Apple LiGothic Medium", "SimHei", "MS Gothic", "MS Hei", sans-serif; + } + Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** parameters-bottom.inc 10 Feb 2004 04:18:48 -0000 1.2.2.1 --- parameters-bottom.inc 10 Feb 2004 05:57:14 -0000 1.2.2.2 *************** *** 15,19 **** ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! Help --- 15,19 ---- ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! ½u¤W»¡©ú Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** parameters-top.inc 10 Feb 2004 04:18:48 -0000 1.3.2.1 --- parameters-top.inc 10 Feb 2004 05:57:14 -0000 1.3.2.2 *************** *** 7,15 **** /includes/common-style.css"> - + + *************** *** 87,91 ****
!

¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

µn¤JKoha

--- 90,94 ----
!

¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

µn¤JKoha

From acli at users.sourceforge.net Tue Feb 10 06:58:47 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:58:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,1.1,1.2 parameters-bottom.inc,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28725/includes Modified Files: about-bottom.inc parameters-bottom.inc Log Message: Markup error Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** about-bottom.inc 10 Feb 2004 05:56:33 -0000 1.1 --- about-bottom.inc 10 Feb 2004 05:58:45 -0000 1.2 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parameters-bottom.inc 10 Feb 2004 05:56:33 -0000 1.4 --- parameters-bottom.inc 10 Feb 2004 05:58:45 -0000 1.5 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú From acli at users.sourceforge.net Tue Feb 10 06:59:22 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:59:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,1.1.2.1,1.1.2.2 parameters-bottom.inc,1.2.2.2,1.2.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28817/includes Modified Files: Tag: rel_2_0 about-bottom.inc parameters-bottom.inc Log Message: Markup errors Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-bottom.inc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** about-bottom.inc 10 Feb 2004 05:57:14 -0000 1.1.2.1 --- about-bottom.inc 10 Feb 2004 05:59:20 -0000 1.1.2.2 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -r1.2.2.2 -r1.2.2.3 *** parameters-bottom.inc 10 Feb 2004 05:57:14 -0000 1.2.2.2 --- parameters-bottom.inc 10 Feb 2004 05:59:20 -0000 1.2.2.3 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú From acli at users.sourceforge.net Tue Feb 10 07:08:37 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 22:08:37 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30242/parameters Modified Files: admin-home.tmpl Log Message: Minor updates Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** admin-home.tmpl 10 Feb 2004 03:08:00 -0000 1.5 --- admin-home.tmpl 10 Feb 2004 06:08:35 -0000 1.6 *************** *** 74,87 ****
! ! ! --- 74,87 ---- ! ! ! *************** *** 103,108 **** ! ! --- 103,108 ---- ! ! From acli at users.sourceforge.net Tue Feb 10 07:09:01 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 22:09:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30303/parameters Modified Files: Tag: rel_2_0 admin-home.tmpl Log Message: Backport from trunk Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** admin-home.tmpl 10 Feb 2004 04:22:01 -0000 1.3.2.1 --- admin-home.tmpl 10 Feb 2004 06:08:59 -0000 1.3.2.2 *************** *** 74,87 **** ! ! ! --- 74,87 ---- ! ! ! *************** *** 103,108 **** ! ! --- 103,108 ---- ! ! From acli at users.sourceforge.net Tue Feb 10 08:07:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:07:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes parameters-top.inc,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6302/includes Modified Files: parameters-top.inc Log Message: SGML syntax corrections Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** parameters-top.inc 10 Feb 2004 03:13:41 -0000 1.19 --- parameters-top.inc 10 Feb 2004 07:07:42 -0000 1.20 *************** *** 5,11 **** KOHA: INTRANET: Parameters /includes/common-style.css"> - - + + From acli at users.sourceforge.net Tue Feb 10 08:33:37 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:33:37 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters branches.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9857/parameters Modified Files: branches.tmpl Log Message: Sync to new en template Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branches.tmpl 10 Feb 2003 07:27:50 -0000 1.6 --- branches.tmpl 10 Feb 2004 07:33:35 -0000 1.7 *************** *** 1,115 **** ! ! !

Logged in as: [Log out]

! !

µn¤J Koha

! ! !
¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|)
 
stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
 
Z39.50 ¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX¸ô®|)
 
stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
 
Z39.50¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
MARC biblio export¥H¾÷Ū®æ¦¡¶×¥X
¶×¥X¾÷Ū®æ¦¡®Ñ¥Ø¥H¾÷Ū®æ¦¡¶×¥X®Ñ¥Ø
¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|)
 
stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
 
Z39.50 ¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX¸ô®|)
 
stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
 
Z39.50¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
MARC biblio export¥H¾÷Ū®æ¦¡¶×¥X
¶×¥X¾÷Ū®æ¦¡®Ñ¥Ø¥H¾÷Ū®æ¦¡¶×¥X®Ñ¥Ø
! ! !
! ! ! ! ! ! ! ! ! ! !
¤ÀÀ]½s½X
À]¦W"> 
>
¦a§}
 
 
¹q¸Ü
¶Ç¯u
¹q¶l
 
! ! ! Confirm delete: !
! > !
!
!
! ! ! !
! !
method=post>
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]¤@Äý
À]¦W½s½X¦a§}Ãþ§O 
! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
! !
! !
¹q¸Ü¡G ! !
¶Ç¯u¡G ! !
¹q¶l¡G ! ! 		! ! (¨S¦³³]©wÃþ§O) ! ! !
! ! ! 		!
! ! ! !
!
! ! !
!
!
method=post>
! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]Ãþ§O
Ãþ§O½s½X»¡©ú
! ! --- 1,232 ---- ! ! !


!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
¤ÀÀ]½s½X ! ! ! ! ! ! !
À]¦W"> 
!
>
¦a§}
 
 
¹q¸Ü
¶Ç¯u
¹q¶l
 
! ! ! ½T©w­n²¾°£¶Ü¡H !
! ! > ! !
!
! !
! ! ! !


! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]¤@Äý !
À]¦W½s½X¦a§}Ãþ§O  
! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
! !
! !
¹q¸Ü¡G ! !
¶Ç¯u¡G ! !
¹q¶l¡G ! ! 		! ! (¨S¦³³]©wÃþ§O) ! ! !
! ! ! 		!
! ! ! !
! 		!
! ! !
!
!
!
method=post> ! ! !
! !
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]Ãþ§O !
Ãþ§O½s½X»¡©ú  
!
! ! ! !
! 		!
! ! !
!
!
!
method=post> ! ! !
! ! ! !


!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Ãþ§O½s½X ! ! ! ! ! ! !
¦WºÙ"> 
»¡©ú"> 
!
! ! ! ! ½T©w­n²¾°£¶Ü¡H !
! ! ! !
!
! !
! ! From acli at users.sourceforge.net Tue Feb 10 08:33:59 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:33:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters branches.tmpl,1.6,1.6.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9925/parameters Modified Files: Tag: rel_2_0 branches.tmpl Log Message: Backport from trunk Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** branches.tmpl 10 Feb 2003 07:27:50 -0000 1.6 --- branches.tmpl 10 Feb 2004 07:33:56 -0000 1.6.2.1 *************** *** 1,115 **** ! ! !

Logged in as: [Log out]

! !

µn¤J Koha

! ! !
! ! !
! ! ! ! ! ! ! ! ! ! !
¤ÀÀ]½s½X
À]¦W"> 
>
¦a§}
 
 
¹q¸Ü
¶Ç¯u
¹q¶l
 
! ! ! Confirm delete: !
! > !
!
!
! ! ! !
! !
method=post>
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]¤@Äý
À]¦W½s½X¦a§}Ãþ§O 
! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
! !
! !
¹q¸Ü¡G ! !
¶Ç¯u¡G ! !
¹q¶l¡G ! ! 		! ! (¨S¦³³]©wÃþ§O) ! ! !
! ! ! 		!
! ! ! !
!
! ! !
!
!
method=post>
! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]Ãþ§O
Ãþ§O½s½X»¡©ú
! ! --- 1,232 ---- ! ! !


!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
¤ÀÀ]½s½X ! ! ! ! ! ! !
À]¦W"> 
!
>
¦a§}
 
 
¹q¸Ü
¶Ç¯u
¹q¶l
 
! ! ! ½T©w­n²¾°£¶Ü¡H !
! ! > ! !
!
! !
! ! ! !


! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]¤@Äý !
À]¦W½s½X¦a§}Ãþ§O  
! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
! !
! !
¹q¸Ü¡G ! !
¶Ç¯u¡G ! !
¹q¶l¡G ! ! 		! ! (¨S¦³³]©wÃþ§O) ! ! !
! ! ! 		!
! ! ! !
! 		!
! ! !
!
!
!
method=post> ! ! !
! !
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
! ¤ÀÀ]Ãþ§O !
Ãþ§O½s½X»¡©ú  
!
! ! ! !
! 		!
! ! !
!
!
!
method=post> ! ! !
! ! ! !


!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Ãþ§O½s½X ! ! ! ! ! ! !
¦WºÙ"> 
»¡©ú"> 
!
! ! ! ! ½T©w­n²¾°£¶Ü¡H !
! ! ! !
!
! !
! ! From acli at users.sourceforge.net Tue Feb 10 08:39:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:39:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.20,1.21 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10628/parameters Modified Files: systempreferences.tmpl Log Message: $script_name in template causes runtime error. Should be a TMPL_VAR Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** systempreferences.tmpl 10 Feb 2004 03:26:06 -0000 1.20 --- systempreferences.tmpl 10 Feb 2004 07:38:57 -0000 1.21 *************** *** 95,99 ****
CONFIRM DELETION
--- 95,99 ----
CONFIRM DELETION !
From acli at users.sourceforge.net Tue Feb 10 08:39:03 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:39:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.18.2.2,1.18.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10622/parameters Modified Files: Tag: rel_2_0 systempreferences.tmpl Log Message: $script_name in template causes runtime error. Should be a TMPL_VAR Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -C2 -r1.18.2.2 -r1.18.2.3 *** systempreferences.tmpl 10 Feb 2004 04:16:06 -0000 1.18.2.2 --- systempreferences.tmpl 10 Feb 2004 07:39:01 -0000 1.18.2.3 *************** *** 95,99 ****
CONFIRM DELETION !
--- 95,99 ----
CONFIRM DELETION !
From acli at users.sourceforge.net Tue Feb 10 08:54:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.3.2.2,1.3.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12907/includes Modified Files: Tag: rel_2_0 parameters-top.inc Log Message: SGML syntax correction Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** parameters-top.inc 10 Feb 2004 05:57:14 -0000 1.3.2.2 --- parameters-top.inc 10 Feb 2004 07:53:58 -0000 1.3.2.3 *************** *** 6,10 **** /includes/common-style.css"> - ! ! --- 26,31 ---- } ! ! From acli at users.sourceforge.net Tue Feb 10 08:54:20 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13009/includes Modified Files: parameters-top.inc Log Message: SGML syntax correction Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** parameters-top.inc 10 Feb 2004 05:56:33 -0000 1.6 --- parameters-top.inc 10 Feb 2004 07:54:16 -0000 1.7 *************** *** 6,10 **** /includes/common-style.css"> - ! ! --- 26,31 ---- } ! ! From acli at users.sourceforge.net Tue Feb 10 08:54:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13085/parameters Added Files: currency.tmpl Log Message: New file from en --- NEW FILE ---

­×§ï³f¹ô¶×²v

·s¼W³f¹ô¶×²v

³f¹ô
³f¹ô
¶×²v
¦¨¥\¼g¤J¸ê®Æ
³f¹ô
¶×²v
³o­Ó°O¿ý¤w³Q¨Ï¥Î¦¸¡A¤£¥i²¾°£¡C
½T©w­n²¾°£¶Ü¡H
¦¨¥\²¾°£¸ê®Æ

³f¹ô¶×²v³]©w

>
±z¬d¸ß
³f¹ô ¶×²v
­×§ï ²¾°£
<< ¤W¤@­¶        ¤U¤@­¶ >>

From acli at users.sourceforge.net Tue Feb 10 08:54:51 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13122/parameters Added Files: Tag: rel_2_0 currency.tmpl Log Message: New file from en --- NEW FILE ---

­×§ï³f¹ô¶×²v

·s¼W³f¹ô¶×²v

³f¹ô
³f¹ô
¶×²v
¦¨¥\¼g¤J¸ê®Æ
³f¹ô
¶×²v
³o­Ó°O¿ý¤w³Q¨Ï¥Î¦¸¡A¤£¥i²¾°£¡C
½T©w­n²¾°£¶Ü¡H
¦¨¥\²¾°£¸ê®Æ

³f¹ô¶×²v³]©w

>
±z¬d¸ß
³f¹ô ¶×²v
­×§ï ²¾°£
<< ¤W¤@­¶        ¤U¤@­¶ >>

From acli at users.sourceforge.net Tue Feb 10 09:02:31 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:02:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14491/parameters Modified Files: currency.tmpl Log Message: This is more consistent Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** currency.tmpl 10 Feb 2004 07:54:36 -0000 1.1 --- currency.tmpl 10 Feb 2004 08:02:25 -0000 1.2 *************** *** 57,63 **** !

­×§ï³f¹ô¶×²v

!

·s¼W³f¹ô¶×²v

--- 57,63 ---- !

­×§ï³f¹ô

!

·s¼W³f¹ô

*************** *** 161,165 **** !

³f¹ô¶×²v³]©w

> --- 161,165 ---- !

³f¹ô¶×²v

> From acli at users.sourceforge.net Tue Feb 10 09:02:49 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:02:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14543/parameters Modified Files: Tag: rel_2_0 currency.tmpl Log Message: This is more consistent Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** currency.tmpl 10 Feb 2004 07:54:49 -0000 1.1.2.1 --- currency.tmpl 10 Feb 2004 08:02:40 -0000 1.1.2.2 *************** *** 57,63 **** !

­×§ï³f¹ô¶×²v

!

·s¼W³f¹ô¶×²v

--- 57,63 ---- !

­×§ï³f¹ô

!

·s¼W³f¹ô

*************** *** 161,165 **** !

³f¹ô¶×²v³]©w

> --- 161,165 ---- !

³f¹ô¶×²v

> From acli at users.sourceforge.net Tue Feb 10 09:22:28 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:22:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters aqbookfund.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17489/parameters Modified Files: aqbookfund.tmpl Log Message: Sync to en, not yet translated Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbookfund.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** aqbookfund.tmpl 5 Feb 2003 05:03:18 -0000 1.2 --- aqbookfund.tmpl 10 Feb 2004 08:22:24 -0000 1.3 *************** *** 1,34 **** ! ! !

Logged in as: [Log Out]

! !

Log In to Koha

! ! ! ! bookfund admin method=post> ! !
You Searched for


! ! ! ! ! " ! ! ! ! ! ! ! !
Book fundNameGroupBudget     
  ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  
!

      


 

! ! !

!
! ! ! ! ! !
Book fund>
Book fund
Name 
Group
 
! ! ! data recorded !
! ! ! ! ! !

 

! ! ! data deleted !
! "" ! ! --- 101,143 ---- } !

!
Book fund
Name
Group
CONFIRM DELETION
! ! ! ! !
Book fund>
Book fund
Name 
 
! ! ! Data recorded !
! ! ! ! ! !

 

! ! ! Data deleted ! ! ! ! From acli at users.sourceforge.net Tue Feb 10 09:22:43 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:22:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters aqbookfund.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17553/parameters Modified Files: Tag: rel_2_0 aqbookfund.tmpl Log Message: Sync to en, not yet translated Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbookfund.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** aqbookfund.tmpl 5 Feb 2003 05:03:18 -0000 1.2 --- aqbookfund.tmpl 10 Feb 2004 08:22:41 -0000 1.2.2.1 *************** *** 1,34 **** ! ! !

Logged in as: [Log Out]

! !

Log In to Koha

! ! ! ! bookfund admin
method=post> ! !
You Searched for


! !

Book fund
Name
CONFIRM DELETION
! ! ! " ! ! ! ! ! ! ! !
Book fundNameGroupBudget     
  ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  
!
      


 

! ! !

!
! ! ! ! ! !
Book fund>
Book fund
Name 
Group
 
! ! ! data recorded !
! ! ! ! ! !

 

! ! ! data deleted !
! "" ! ! --- 101,143 ---- } !

!
Book fund
Name
Group
CONFIRM DELETION
! ! ! ! !
Book fund>
Book fund
Name 
 
! ! ! Data recorded !
! ! ! ! ! !

 

! ! ! Data deleted ! ! ! ! From acli at users.sourceforge.net Tue Feb 10 09:36:15 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:36:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters itemtypes.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20054/parameters Modified Files: itemtypes.tmpl Log Message: Sync to en template Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/itemtypes.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** itemtypes.tmpl 5 Feb 2003 04:44:18 -0000 1.2 --- itemtypes.tmpl 10 Feb 2004 08:36:13 -0000 1.3 *************** *** 1,3 **** ! ! ! !

§ó§ïÀ]ÂÃÃþ§O

! !

¥[¤@À]ÂÃÃþ§O

! !
Book fund
Name
CONFIRM DELETION
! ! ! ! ! ! ! ! ! ! ! ! !
À]ÂÃÃþ§O>
À]ÂÃÃþ§O
»¡©ú 
¥i­É¦h¤[¡H¡]¥H¤é­p¡^
¥i§_Äò­É¡Hchecked value=1>
¶O¥Î
 
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
À]ÂÃÃþ§O
»¡©ú
¥i­É¦h¤[ ¤é¤£¥i­É¥X
¥i§_Äò­É¥i¥HÄò­É¤£¥iÄò­É
¶O¥Î
³oºØÀ]ÂÃÃþ§O¦³¨t²Î¤º¤w¥X²{¤F ¦¸¡A¤£¥i§R°£¡C
¯uªº­n§R°£¶Ü¡H
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
½s½X ! »¡©ú¥i­É¦h¤[¥i§_Äò­É¶O¥Î  
¤é¤£¥i­É¥X¥i¥HÄò­É¤£¥iÄò­É?op=add_form&itemtype=">§ó§ï?op=delete_confirm&itemtype=">§R°£
!
!
! ! --- 60,162 ---- } ! ! !

­×§ïÀ]ÂÃÃþ§O

! !

·s¼WÀ]ÂÃÃþ§O

! !
! ! ! ! ! ! ! ! ! ! ! ! !
À]ÂÃÃþ§O>
À]ÂÃÃþ§O
»¡©ú 
¥i­É¦h¤[ (¥H¤é­p)
¥i§_Äò­Échecked value=1>
­É¾\¶O¥Î
 
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
À]ÂÃÃþ§O
»¡©ú
¥i­É¦h¤[¤é¤£¥i­É¥X
¥i§_Äò­É¥i¥HÄò­É¤£¥iÄò­É
­É¾\¶O¥Î
³o­Ó°O¿ý³Q¥Î¦¸¡A¤£¯à²¾°£¡C
½T©w­n²¾°£¶Ü¡H
! ! !

³]©wÀ]ÂÃÃþ§O

! ! ! ! ! ! ! ! ! ! ! ! ! ! !
½s½X ! »¡©ú¥i­É¦h¤[¥i§_Äò­É­É¾\¶O¥Î­×§ï²¾°£
¥i¥HÄò­É¤£¥iÄò­É?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
!
!
! ! ! ! ! ! !
! ! //images/1leftarrow.png" title="¤W¤@­¶" ALT="¤W¤@­¶" BORDER=0>//images/1rightarrow.png" title="¤U¤@­¶" ALT="¤U¤@­¶" BORDER=0>
! ! From tipaul at users.sourceforge.net Tue Feb 10 10:02:56 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 01:02:56 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac-css.fr,1.1.2.4,1.1.2.5 translator_doc.txt,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24737/misc/translator Modified Files: Tag: rel_2_0 opac-css.fr translator_doc.txt Log Message: * updated french css opac * fixes in translator doc Index: opac-css.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/Attic/opac-css.fr,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -r1.1.2.4 -r1.1.2.5 *** opac-css.fr 26 Jan 2004 10:42:27 -0000 1.1.2.4 --- opac-css.fr 10 Feb 2004 09:02:53 -0000 1.1.2.5 *************** *** 12,18 **** Author Auteur Available Disponible ! barcode LIMITED:code barre ! Barcode LIMITED:Code barre ! BARCODE LIMITED:CODE BARRE Biblio number Notice biblio : Biblionumber Numéro notice : --- 12,18 ---- Author Auteur Available Disponible ! barcode LIMITED;code barre ! Barcode LIMITED;Code barre ! BARCODE LIMITED;CODE BARRE Biblio number Notice biblio : Biblionumber Numéro notice : *************** *** 79,83 **** Library Card Carte lecteur Loan Length Durée prêt ! Location LIMITED:Localisation location LIMITED;Localisation Log In S'identifier --- 79,83 ---- Library Card Carte lecteur Loan Length Durée prêt ! Location LIMITED;Localisation location LIMITED;Localisation Log In S'identifier *************** *** 135,139 **** Results through of records. résultats de à results found Réponses trouvées ! search LIMITED:chercher Search the catalogue Chercher dans le catalogue Sep Sep --- 135,139 ---- Results through of records. résultats de à results found Réponses trouvées ! search LIMITED;recherche Search the catalogue Chercher dans le catalogue Sep Sep Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** translator_doc.txt 16 Jan 2004 16:24:19 -0000 1.1.2.1 --- translator_doc.txt 10 Feb 2004 09:02:53 -0000 1.1.2.2 *************** *** 15,25 **** ============ 1- create your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & french being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version, go back to pt1 & repeat. WEAKNESSES --- 15,31 ---- ============ 1- create your translation file : ! ./tmpl_process.pl create -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images/css files in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version : ! 1- update your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate new your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) ! 3- create your translated version : ! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy new images/css files in your new directory if needed WEAKNESSES From tipaul at users.sourceforge.net Tue Feb 10 10:09:45 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 01:09:45 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.32.2.5,1.32.2.6 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26014/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.pl Log Message: small fix to handle tags<10 Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.32.2.5 retrieving revision 1.32.2.6 diff -C2 -r1.32.2.5 -r1.32.2.6 *** addbiblio.pl 6 Feb 2004 14:14:55 -0000 1.32.2.5 --- addbiblio.pl 10 Feb 2004 09:09:41 -0000 1.32.2.6 *************** *** 232,235 **** --- 232,236 ---- next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); + next if ($tag<10); next if (defined($record->field($tag)->subfield($subfield))); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 241,245 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); From acli at users.sourceforge.net Tue Feb 10 10:36:46 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:36:46 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31712 Modified Files: tmpl_process.pl Log Message: Arrays are always defined. We should check its length instead. Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** tmpl_process.pl 9 Feb 2004 23:34:08 -0000 1.6 --- tmpl_process.pl 10 Feb 2004 09:36:44 -0000 1.7 *************** *** 31,35 **** # Checks for missing input and string list arguments ! if( !defined(@in_files) || !defined($str_file) ) { usage("You must at least specify input and string list filenames."); --- 31,35 ---- # Checks for missing input and string list arguments ! if( !@in_files || !defined($str_file) ) { usage("You must at least specify input and string list filenames."); From acli at users.sourceforge.net Tue Feb 10 10:40:23 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:40:23 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32380 Modified Files: tmpl_process.pl Log Message: Minor correction in help text This handling for --help works too, and is less wordy Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** tmpl_process.pl 10 Feb 2004 09:36:44 -0000 1.7 --- tmpl_process.pl 10 Feb 2004 09:40:21 -0000 1.8 *************** *** 19,27 **** 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help, ) || (usage(), exit(-1)); - help() if $help; - # utiliser glob() pour tous les fichiers d'un repertoire --- 19,25 ---- 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => sub { help() }, ) || (usage(), exit(-1)); # utiliser glob() pour tous les fichiers d'un repertoire *************** *** 428,432 **** input files. ! -r or --recursive= Use the recursive mode to process every entry in subdirectories. Note: Symbolic links used to link directories are not supported. --- 426,430 ---- input files. ! -r or --recursive Use the recursive mode to process every entry in subdirectories. Note: Symbolic links used to link directories are not supported. From acli at users.sourceforge.net Tue Feb 10 10:42:20 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:42:20 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv581 Modified Files: tmpl_process.pl Log Message: exit(-1) after usage() is not needed Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** tmpl_process.pl 10 Feb 2004 09:40:21 -0000 1.8 --- tmpl_process.pl 10 Feb 2004 09:42:18 -0000 1.9 *************** *** 20,24 **** 'sep=s' => \$split_char, 'help' => sub { help() }, ! ) || (usage(), exit(-1)); # utiliser glob() pour tous les fichiers d'un repertoire --- 20,24 ---- 'sep=s' => \$split_char, 'help' => sub { help() }, ! ) || usage(); # utiliser glob() pour tous les fichiers d'un repertoire From tipaul at users.sourceforge.net Tue Feb 10 14:15:48 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:15:48 -0800 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.78.2.2,1.78.2.3 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10256/C4 Modified Files: Tag: rel_2_0 Biblio.pm Log Message: removing 2 warnings Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.78.2.2 retrieving revision 1.78.2.3 diff -C2 -r1.78.2.2 -r1.78.2.3 *** Biblio.pm 26 Jan 2004 10:38:06 -0000 1.78.2.2 --- Biblio.pm 10 Feb 2004 13:15:46 -0000 1.78.2.3 *************** *** 1558,1562 **** } $query =~ s/\,$//; - warn "Q 1560 : $query"; my $sth2=$dbh->prepare($query); $sth2->execute(@bind); --- 1558,1561 ---- *************** *** 1583,1587 **** #replacing the last , by ",?)" $query=~ s/\,$//; - warn "Q olddelbiblio : $query"; $sth=$dbh->prepare($query); $sth->execute(@bind); --- 1582,1585 ---- *************** *** 2194,2197 **** --- 2192,2198 ---- # $Id$ # $Log$ + # Revision 1.78.2.3 2004/02/10 13:15:46 tipaul + # removing 2 warnings + # # Revision 1.78.2.2 2004/01/26 10:38:06 tipaul # dealing correctly "bulk" field From tipaul at users.sourceforge.net Tue Feb 10 14:17:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.24.2.1,1.24.2.2 addbooks.tmpl,1.12,1.12.2.1 isbnsearch.tmpl,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10580/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.tmpl addbooks.tmpl isbnsearch.tmpl Log Message: bug fixes in HTML, and (addbiblio.tmpl), bugfix for bibliodeletion Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -C2 -r1.24.2.1 -r1.24.2.2 *** addbiblio.tmpl 26 Jan 2004 10:46:36 -0000 1.24.2.1 --- addbiblio.tmpl 10 Feb 2004 13:17:08 -0000 1.24.2.2 *************** *** 17,35 **** ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
0
1
2
3
4
5
6
7
8
9
 "> ! ! z3950 search
! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
0
1
2
3
4
5
6
7
8
9
 "> ! ! ! ! ! ! z3950 search
+   + + +
>>>>
+ +
*************** *** 85,88 **** --- 100,115 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 110,113 **** --- 137,152 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 135,138 **** --- 174,189 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 160,163 **** --- 211,226 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 185,188 **** --- 248,263 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 210,213 **** --- 285,300 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 235,238 **** --- 322,337 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 260,263 **** --- 359,374 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 285,288 **** --- 396,404 ---- + + +
<<<<
+ + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** addbooks.tmpl 9 Dec 2003 10:29:06 -0000 1.12 --- addbooks.tmpl 10 Feb 2004 13:17:08 -0000 1.12.2.1 *************** *** 22,26 **** ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
--- 22,26 ---- ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
*************** *** 32,38 ****   ! Create Empty biblio ! Create Empty biblio --- 32,38 ----   ! Create Empty biblio ! Create Empty biblio *************** *** 52,56 **** Keyword: ! --- 52,56 ---- Keyword: ! Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** isbnsearch.tmpl 9 Dec 2003 10:29:07 -0000 1.11 --- isbnsearch.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 *************** *** 5,9 **** results found
! Results to displayed

--- 5,9 ---- results found
! Results to displayed

*************** *** 46,50 **** ! ">Add Items ">Edit... --- 46,50 ---- ! ">Add items ">Edit... From tipaul at users.sourceforge.net Tue Feb 10 14:17:11 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.7.2.1,1.7.2.2 basket.tmpl,1.7.2.2,1.7.2.3 newbasket2.tmpl,1.7,1.7.2.1 order.tmpl,1.11,1.11.2.1 recieve.tmpl,1.6,1.6.2.1 supplier.tmpl,1.8,1.8.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10580/koha-tmpl/intranet-tmpl/default/en/acqui Modified Files: Tag: rel_2_0 acquire.tmpl basket.tmpl newbasket2.tmpl order.tmpl recieve.tmpl supplier.tmpl Log Message: bug fixes in HTML, and (addbiblio.tmpl), bugfix for bibliodeletion Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** acquire.tmpl 13 Jan 2004 17:29:30 -0000 1.7.2.1 --- acquire.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.2 *************** *** 6,10 **** !

Receipt Summary for: Invoice,

--- 6,10 ---- !

Receipt Summary for: Invoice

Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -r1.7.2.2 -r1.7.2.3 *** basket.tmpl 26 Jan 2004 10:46:36 -0000 1.7.2.2 --- basket.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.3 *************** *** 2,6 ****

Shopping Basket for >


! (Our Reference: , #, authorised by: )

--- 2,6 ----

Shopping Basket for >


! Our Reference: , # authorised by

Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** newbasket2.tmpl 9 Dec 2003 10:29:08 -0000 1.7 --- newbasket2.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.1 *************** *** 30,34 **** results found. !
Results to displayed. --- 30,34 ---- results found. !
Results to displayed.
Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** order.tmpl 9 Dec 2003 10:29:08 -0000 1.11 --- order.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 *************** *** 23,27 **** > > - - -
! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > --- 23,31 ----
! ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > ! ! Inactive ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** recieve.tmpl 9 Dec 2003 10:29:08 -0000 1.6 --- recieve.tmpl 10 Feb 2004 13:17:08 -0000 1.6.2.1 *************** *** 6,10 **** !

Receipt Summary for : , Invoice

--- 6,10 ---- !

Receipt Summary for : Invoice

Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** supplier.tmpl 9 Dec 2003 10:29:08 -0000 1.8 --- supplier.tmpl 10 Feb 2004 13:17:08 -0000 1.8.2.1 *************** *** 85,91 ****
/images/filesave.png" border=0 title="save" alt="save">
--- 85,88 ---- *************** *** 96,101 **** Supplier is ! checked>Active ! checked>Inactive --- 93,104 ---- Supplier is ! ! ! Active ! Inactive ! ! Active ! Inactive ! *************** *** 153,157 **** !

--- 156,161 ---- !
!
/images/filesave.png" border=0 title="save" alt="save" class="button">
From tipaul at users.sourceforge.net Tue Feb 10 14:17:59 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue catalogue-home.tmpl,1.8.2.1,1.8.2.2 cmsdsearchresults.tmpl,1.2,1.2.2.1 detail-opac.tmpl,1.5,1.5.2.1 detail.tmpl,1.9.2.2,1.9.2.3 MARCdetail.tmpl,1.14,1.14.2.1 moredetail.tmpl,1.9,1.9.2.1 subject.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10744/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl subject.tmpl Log Message: HTML modifs to improve translation tool Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -r1.8.2.1 -r1.8.2.2 *** catalogue-home.tmpl 26 Jan 2004 10:46:35 -0000 1.8.2.1 --- catalogue-home.tmpl 10 Feb 2004 13:17:57 -0000 1.8.2.2 *************** *** 24,28 **** ! HELP
--- 24,28 ---- ! HELP
*************** *** 97,101 **** ! Virtual Bookshelves --- 97,101 ---- ! Virtual Bookshelves Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** cmsdsearchresults.tmpl 9 Dec 2003 10:29:05 -0000 1.2 --- cmsdsearchresults.tmpl 10 Feb 2004 13:17:57 -0000 1.2.2.1 *************** *** 24,28 ****
! Results through of records.
--- 24,28 ----
! Results through of records.
Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** detail-opac.tmpl 9 Dec 2003 10:29:06 -0000 1.5 --- detail-opac.tmpl 10 Feb 2004 13:17:57 -0000 1.5.2.1 *************** *** 38,46 **** ! ! --- 38,46 ----
Item Type Class Location Date DueLast Seen
! ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -r1.9.2.2 -r1.9.2.3 *** detail.tmpl 26 Jan 2004 10:46:35 -0000 1.9.2.2 --- detail.tmpl 10 Feb 2004 13:17:57 -0000 1.9.2.3 *************** *** 60,67 ****
Item type Class Location Date DueLast seen
! ! --- 60,67 ----
Item Type Location Date DueLast Seen Barcode Volume
! ! Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -r1.14 -r1.14.2.1 *** MARCdetail.tmpl 9 Dec 2003 10:29:06 -0000 1.14 --- MARCdetail.tmpl 10 Feb 2004 13:17:57 -0000 1.14.2.1 *************** *** 19,22 **** --- 19,23 ---- + *************** *** 257,263 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** moredetail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- moredetail.tmpl 10 Feb 2004 13:17:57 -0000 1.9.2.1 *************** *** 31,38 **** Biblionumber:
! Item Type:
URL:
! Loan Length:
! Rental Charge:
Classification:
ISBN:
--- 31,38 ---- Biblionumber:
! Item type:
URL:
! Loan length:
! Rental charge:
Classification:
ISBN:
Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** subject.tmpl 9 Dec 2003 10:29:06 -0000 1.4 --- subject.tmpl 10 Feb 2004 13:17:57 -0000 1.4.2.1 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 ****
Item type Location Date DueLast seen Barcode Volume//images/edittrash.png"> ">Normal')">Print MARC biblio :
! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
Subject
opacintra&subjectitems=>
! ! !
! &startfrom=>Previous Records ! ! &startfrom=>Next Records !
!

! Results through of records.
--- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Subject
! !
! ! ! ! ! !
! ">Previous Records ! ! ">Next Records !
!

! Results through of records.
From tipaul at users.sourceforge.net Tue Feb 10 14:19:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:19:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15.2.2,1.15.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: Tag: rel_2_0 circulation.tmpl Log Message: HTML modifs to improve translation tool Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15.2.2 retrieving revision 1.15.2.3 diff -C2 -r1.15.2.2 -r1.15.2.3 *** circulation.tmpl 29 Jan 2004 19:07:30 -0000 1.15.2.2 --- circulation.tmpl 10 Feb 2004 13:19:01 -0000 1.15.2.3 *************** *** 5,9 **** ! &branch=&printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &printer=&print=yes"> Next Borrower  *************** *** 14,24 **** !

Circulation: Issues


! Branch:
! Printer:
! Change Settings "> "> -

 

--- 14,21 ----
!

Circulation: Issues

! Branch: Printer: Change Settings "> "> *************** *** 38,42 **** Branch:
Printer:
! Change Settings"> "> --- 35,39 ---- Branch:
Printer:
! Change Settings"> "> *************** *** 141,145 ****
! --- 138,142 ----
! *************** *** 172,176 ****
! ! --- 13,17 ---- ! *************** *** 41,45 **** Nicholas Rosasco, (Documentation Compiler)
Mike Hansen
! MJ Ray et Turo Technology LLP, england (quality control, installer & updater)
Nicolas Morin, Français Translation
--- 41,45 ---- Nicholas Rosasco, (Documentation Compiler)
Mike Hansen
! 1
Nicolas Morin, Français Translation
*************** *** 65,69 **** Ambrose Li
Andrew Arensburger
! Benedykt P. Barszcz (polish for 2.0)
Brig C. McCoy
Daniel Holth
--- 65,69 ---- Ambrose Li
Andrew Arensburger
! 1
Brig C. McCoy
Daniel Holth
*************** *** 84,88 ****
--- 169,173 ---- ! ! --- 184,188 ---- ! *************** *** 225,229 ****
*************** *** 187,191 **** Item Barcode:
Item Barcode:
! ! --- 93,104 ---- ! ! ! Actif ! Inactif ! *************** *** 153,157 ****
Borrower information
--- 222,226 ---- ! --- 260,264 ---- ! *************** *** 273,279 ****
Borrower information
*************** *** 263,267 **** !
ODUESYes, See below
ODUESYes, See below
!



!
/images/background-mem.gif"> --- 270,276 ----
!
! --- 90,100 ---- ! Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** common-style.css 4 Sep 2003 13:04:12 -0000 1.8 --- common-style.css 10 Feb 2004 13:19:21 -0000 1.8.2.1 *************** *** 2,8 **** text-align: center; font: 1.2em sans-serif; ! padding: 10px 15px; border-style: solid; ! border-width: 2px; border-color: black; text-decoration: none; --- 2,8 ---- text-align: center; font: 1.2em sans-serif; ! padding: 3px; border-style: solid; ! border-width: 1px; border-color: black; text-decoration: none; *************** *** 13,17 **** background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } - #problem { color: red; --- 13,16 ---- *************** *** 28,31 **** --- 27,36 ---- border-left:1px solid #000000; } + a { + text-decoration: none; + } + a:hover { + text-decoration: none; + } a.submenu { font-weight: normal; Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** issues-top.inc 9 Dec 2003 10:29:04 -0000 1.6 --- issues-top.inc 10 Feb 2004 13:19:21 -0000 1.6.2.1 *************** *** 172,176 **** ! ! --- 118,122 ---- ! From tipaul at users.sourceforge.net Tue Feb 10 14:54:18 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:54:18 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports reports-home.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19195/koha-tmpl/intranet-tmpl/default/en/reports Modified Files: Tag: rel_2_0 reports-home.tmpl Log Message: html fix for translation Index: reports-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** reports-home.tmpl 9 Dec 2003 10:28:59 -0000 1.4 --- reports-home.tmpl 10 Feb 2004 13:54:00 -0000 1.4.2.1 *************** *** 8,13 ****
  • Till Reconciliation: Daily Report (yesterday) !
  • Till Reconciliation: Daily ! Report (today)
  • Overdue items --- 8,12 ----
    • Till Reconciliation: Daily Report (yesterday) !
    • Till Reconciliation: Daily Report (today)
    • Overdue items From tipaul at users.sourceforge.net Tue Feb 10 15:05:41 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:05:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.3.2.3,1.3.2.4 acquire.tmpl,1.1.2.3,1.1.2.4 basket.tmpl,1.5.2.2,1.5.2.3 newbasket2.tmpl,1.4.2.3,1.4.2.4 newbasket.tmpl,1.1.2.2,1.1.2.3 newbiblio.tmpl,1.5.2.3,1.5.2.4 order.tmpl,1.3.2.1,1.3.2.2 recieve.tmpl,1.1.2.1,1.1.2.2 supplier.tmpl,1.4.2.3,1.4.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: Tag: rel_2_0 acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieve.tmpl supplier.tmpl Log Message: french translation fixes Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** acqui-home.tmpl 28 Jan 2004 16:44:20 -0000 1.3.2.3 --- acqui-home.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.4 *************** *** 54,58 ****
! --- 54,58 ---- ! *************** *** 72,76 **** ! --- 72,76 ---- ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** acquire.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- acquire.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 6,10 **** !

Receipt Summary for: Facture,

--- 6,10 ---- !

Sommaire pour: Facture

*************** *** 72,76 ****
! --- 72,76 ---- ! *************** *** 135,139 **** !

 

--- 135,139 ---- !

 

Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -r1.5.2.2 -r1.5.2.3 *** basket.tmpl 26 Jan 2004 10:47:58 -0000 1.5.2.2 --- basket.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.3 *************** *** 2,6 ****

Panier pour >


! (Ref: , #, saisi par: )

--- 2,6 ----

Panier pour >


! Notre ref: , # validée par

Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** newbasket2.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.3 --- newbasket2.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4 *************** *** 17,21 **** > Nouvelle recherche: !

--- 17,21 ---- > Nouvelle recherche: !
*************** *** 30,34 **** Résultats trouvés. !
Résultats to displayed.
/images/background-mem.gif"> From tipaul at users.sourceforge.net Tue Feb 10 14:19:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:19:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes cat-top.inc,1.18,1.18.2.1 common-style.css,1.8,1.8.2.1 issues-top.inc,1.6,1.6.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11030/koha-tmpl/intranet-tmpl/default/en/includes Modified Files: Tag: rel_2_0 cat-top.inc common-style.css issues-top.inc Log Message: HTML modifs to improve translation tool Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -r1.18 -r1.18.2.1 *** cat-top.inc 9 Dec 2003 10:29:04 -0000 1.18 --- cat-top.inc 10 Feb 2004 13:19:21 -0000 1.18.2.1 *************** *** 90,97 **** ! Add biblio ! Cat maintenance
! Virtual shelves ! Add biblio ! ! Cat maintenance
TOTALYou have error(s) in your MARC configuration. Please fix them before using koha
TOTALYou have error(s) in your MARC configuration. Please fix them before using koha
Total DépenséComtd Disp.
Total DépenséEngagé Disp.
Volume Info (for serials) *
Info Volume (pour périodiques) *
--- 30,34 ---- Résultats trouvés. !
Résultats to affiché.
*************** *** 93,97 **** &offset=&type=&id=&basket=&search=&author="> ! Suivant --- 93,97 ---- &offset=&type=&id=&basket=&search=&author="> ! Next Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** newbasket.tmpl 26 Jan 2004 10:47:58 -0000 1.1.2.2 --- newbasket.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.3 *************** *** 2,6 ****

Panier for


! (Ref: , #, saisi par: )
Tél.: , Fax:
,
--- 2,6 ----

Panier for


! (Notre ref: , #, validée par: )
Tél.: , Fax:
,
Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** newbiblio.tmpl 28 Jan 2004 16:44:20 -0000 1.5.2.3 --- newbiblio.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.4 *************** *** 130,134 **** ! --- 130,134 ---- ! Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** order.tmpl 20 Jan 2004 09:09:16 -0000 1.3.2.1 --- order.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.2 *************** *** 23,30 **** > --- 23,34 ---- > Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** recieve.tmpl 20 Jan 2004 09:09:16 -0000 1.1.2.1 --- recieve.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 6,10 **** !

Receipt Summary for : , Facture

--- 6,10 ---- !

Sommaire pour : Facture

Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** supplier.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.3 --- supplier.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4 *************** *** 85,91 ****
- - -
Coûts budgetés
(ex GST, inc discount) 		" onchange='mettre à jour(this.form)'>
Coûts budgetés
(ex TVA, remise) 		" onchange='mettre à jour(this.form)'>
! /images/mail_send.png" title="Ajouter order" ALT="Ajouter" BORDER=0 > ! /images/mail_get.png" title="receive" ALT="Ajouter" BORDER=0 >
! ! /images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 > ! ! Inactif ! ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 >
/images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer">
--- 85,88 ---- *************** *** 96,101 ****
Le fournisseur estchecked>Active ! checked>Inactive
Le fournisseur est ! ! Actif ! Inactif
! --- 156,161 ----
!
!
/images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" class="button"> From tipaul at users.sourceforge.net Tue Feb 10 15:05:42 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:05:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.1.2.2,1.1.2.3 auth.tmpl,1.1.2.1,1.1.2.2 boraccount.tmpl,1.4.2.2,1.4.2.3 charges.tmpl,1.1.2.1,1.1.2.2 default.tmpl,1.1.2.3,1.1.2.4 intranet-main.tmpl,1.6.2.1,1.6.2.2 mancredit.tmpl,1.1.2.1,1.1.2.2 maninvoice.tmpl,1.1.2.3,1.1.2.4 member-flags.tmpl,1.1.2.1,1.1.2.2 modbibitem.tmpl,1.1.2.3,1.1.2.4 modbib.tmpl,1.2.2.3,1.2.2.4 newjmember.tmpl,1.1.2.3,1.1.2.4 newmember.tmpl,1.3.2.3,1.3.2.4 opac-main.tmpl,1.1.2.2,1.1.2.3 overdue.tmpl,1.1.2.1,1.1.2.2 request.tmpl,1.5.2.3,1.5.2.4 shelves.tmpl,1.1.2.2,1.1.2.3 thesaurus_popup.tmpl,1.3.2.2,1.3.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/default/fr Modified Files: Tag: rel_2_0 about.tmpl auth.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl member-flags.tmpl modbibitem.tmpl modbib.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl request.tmpl shelves.tmpl thesaurus_popup.tmpl Log Message: french translation fixes Index: about.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/about.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** about.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- about.tmpl 10 Feb 2004 14:05:38 -0000 1.1.2.3 *************** *** 13,17 ****
OS version (from 'uname -a'):
Version Système (uname -a):
! Michel Lerenard (Esiee Ecole)
Mike Johnson
Mike Mylonas
--- 84,88 ---- 		! 1
Mike Johnson
Mike Mylonas
Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/auth.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** auth.tmpl 20 Jan 2004 09:14:25 -0000 1.1.2.1 --- auth.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 1,20 **** !

Désolé, vous n'avez pas la permission d'accéder à cette page.

!

Sorry, your session has timed out. Please connecter again.

!

Vous avez changé d'adresse IP. Identifiez-vous à nouveau.

!

Vous entered an incorrect username ou password. Please try again.

--- 1,20 ---- !

Désolé, vous n'avez pas la permission d'accéder à cette page.

!

Sorry, your session has timed out. Please connecter again.

!

Vous avez changé d'adresse IP. Identifiez-vous à nouveau.

!

Vous entered an incorrect username ou password. Please try again.

Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -r1.4.2.2 -r1.4.2.3 *** boraccount.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.2 --- boraccount.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.3 *************** *** 3,7 **** !

Account for ">

Créer une facture manuelle   --- 3,7 ---- !

Compte pour ">

Créer une facture manuelle   *************** *** 39,43 ****

!

 

--- 39,43 ----
!

 

Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** charges.tmpl 20 Jan 2004 09:14:53 -0000 1.1.2.1 --- charges.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 4,9 ****

! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, son cycle
! eg 1,7,7 = $1 fine, after 7 days, every 7 days.

--- 4,9 ----

! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours.

Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/default.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** default.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- default.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 16,22 ****
! &startfrom=>Précédents Records ! &startfrom=>Suivant Records
--- 16,22 ----
! &startfrom=>Previous Records ! &startfrom=>Next Records
*************** *** 24,28 ****
! Résultats à sur enregistrements.

--- 24,28 ----
! Résultats à sur enregistrements.
Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -r1.6.2.1 -r1.6.2.2 *** intranet-main.tmpl 20 Jan 2004 09:14:53 -0000 1.6.2.1 --- intranet-main.tmpl 10 Feb 2004 14:05:39 -0000 1.6.2.2 *************** *** 81,85 **** !
Saisissez une valeur et pressez la touche Entrée..
--- 81,85 ---- !
Saisissez une valeur et pressez la touche Entrée..
*************** *** 87,91 **** /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Advanced Search (More Options)
--- 87,91 ---- /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Recherche avancée (plus d'options)
*************** *** 110,114 **** !
Saisissez une valeur et pressez la touche Entrée..
/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0"> --- 110,114 ---- !
Saisissez une valeur et pressez la touche Entrée..
/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0"> Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** mancredit.tmpl 20 Jan 2004 09:14:53 -0000 1.1.2.1 --- mancredit.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 16,20 **** Description Montant ! --- 16,20 ---- Description Montant ! Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** maninvoice.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- maninvoice.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 19,23 **** Description Montant ! --- 19,23 ---- Description Montant ! Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/member-flags.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** member-flags.tmpl 20 Jan 2004 09:14:25 -0000 1.1.2.1 --- member-flags.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 23,27 ****

! --- 23,27 ----

! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** modbibitem.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- modbibitem.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 24,28 **** ! Catég ouvrage" size=20> --- 24,28 ---- ! Catég ouvrage" size=20> *************** *** 68,72 **** ! CHANGES TO AFFECT THESE BARCODES
Sélectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-sélectionnés ne seront pas affectés. --- 68,72 ---- ! MODIFS SUR CES CODES-BARRES
Sélectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-sélectionnés ne seront pas affectés. *************** *** 101,105 **** AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some items, tick the appropriate ones et a new group record will be created automatically for them. !

 

--- 101,105 ---- AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some items, tick the appropriate ones et a new group record will be created automatically for them. !

 

Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** modbib.tmpl 28 Jan 2004 16:44:20 -0000 1.2.2.3 --- modbib.tmpl 10 Feb 2004 14:05:39 -0000 1.2.2.4 *************** *** 53,57 ****
! --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** searchresults.tmpl 28 Jan 2004 16:44:56 -0000 1.2.2.3 --- searchresults.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 66,70 **** ! &=&type=opacintra>Précédents Records   --- 66,70 ---- ! &=&type=opacintra>Previous Records   *************** *** 73,77 **** ! &=&type=opacintra>Suivant Records   --- 73,77 ---- ! &=&type=opacintra>Next Records   Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** subject.tmpl 28 Jan 2004 16:44:56 -0000 1.2.2.3 --- subject.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 **** ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
Sujet
opacintra&subjectitems=>
! ! !
! &startfrom=>Précédents Records ! ! &startfrom=>Suivant Records !
!

! Résultats à sur enregistrements.
--- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
Sujet
! !
! ! ! ! ! !
! ">Previous Records ! ! ">Next Records !
!

! Résultats à sur enregistrements.
From tipaul at users.sourceforge.net Tue Feb 10 15:06:20 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes about-bottom.inc,1.2.2.1,1.2.2.2 about-top.inc,1.3.2.1,1.3.2.2 acquisitions-bottom.inc,1.4.2.1,1.4.2.2 cat-bottom.inc,1.4.2.1,1.4.2.2 cat-top.inc,1.12.2.1,1.12.2.2 circulation-bottom.inc,1.4.2.1,1.4.2.2 common-style.css,1.4,1.4.2.1 issues-bottom.inc,1.4.2.1,1.4.2.2 issues-top.inc,1.3.2.2,1.3.2.3 members-bottom.inc,1.4.2.1,1.4.2.2 members-top.inc,1.10.2.1,1.10.2.2 parameters-bottom.inc,1.4.2.1,1.4.2.2 reports-bottom.inc,1.4.2.1,1.4.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21912/koha-tmpl/intranet-tmpl/default/fr/includes Modified Files: Tag: rel_2_0 about-bottom.inc about-top.inc acquisitions-bottom.inc cat-bottom.inc cat-top.inc circulation-bottom.inc common-style.css issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc parameters-bottom.inc reports-bottom.inc Log Message: french translation fixes Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** about-bottom.inc 20 Jan 2004 09:10:33 -0000 1.2.2.1 --- about-bottom.inc 10 Feb 2004 14:06:17 -0000 1.2.2.2 *************** *** 1,3 **** !

 

--- 1,3 ---- !

 

Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** about-top.inc 20 Jan 2004 09:10:33 -0000 1.3.2.1 --- about-top.inc 10 Feb 2004 14:06:17 -0000 1.3.2.2 *************** *** 7,11 **** ! --- 7,11 ---- ! *************** *** 33,37 **** ! + + +
--- 33,37 ----
! --- 90,100 ---- ! Index: circulation-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** circulation-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- circulation-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

 

--- 1,3 ---- !

 

Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/common-style.css,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** common-style.css 7 Aug 2003 14:19:55 -0000 1.4 --- common-style.css 10 Feb 2004 14:06:17 -0000 1.4.2.1 *************** *** 2,8 **** text-align: center; font: 1.2em sans-serif; ! padding: 10px 15px; border-style: solid; ! border-width: 2px; border-color: black; text-decoration: none; --- 2,8 ---- text-align: center; font: 1.2em sans-serif; ! padding: 3px; border-style: solid; ! border-width: 1px; border-color: black; text-decoration: none; *************** *** 13,17 **** background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } ! #menubar { border-top:1px solid #666666; --- 13,20 ---- background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } ! #problem { ! color: red; ! font-weight:bold; ! } #menubar { border-top:1px solid #666666; *************** *** 24,27 **** --- 27,36 ---- border-left:1px solid #000000; } + a { + text-decoration: none; + } + a:hover { + text-decoration: none; + } a.submenu { font-weight: normal; Index: issues-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** issues-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- issues-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

 

--- 1,3 ---- !

 

Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** issues-top.inc 26 Jan 2004 10:47:57 -0000 1.3.2.2 --- issues-top.inc 10 Feb 2004 14:06:17 -0000 1.3.2.3 *************** *** 89,94 **** --- 73,80 ---- Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** parameters-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- parameters-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

 

--- 1,3 ---- !

 

Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** reports-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- reports-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

 

--- 1,3 ---- !

 

From tipaul at users.sourceforge.net Tue Feb 10 15:06:20 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio-nomarc.tmpl,1.1.2.3,1.1.2.4 addbiblio.tmpl,1.10.2.3,1.10.2.4 addbooks.tmpl,1.3.2.3,1.3.2.4 additem-nomarc.tmpl,1.1.2.3,1.1.2.4 isbnsearch.tmpl,1.2.2.3,1.2.2.4 marcimport.tmpl,1.2.2.3,1.2.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21912/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: Tag: rel_2_0 addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl isbnsearch.tmpl marcimport.tmpl Log Message: french translation fixes Index: addbiblio-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/addbiblio-nomarc.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** addbiblio-nomarc.tmpl 28 Jan 2004 16:44:56 -0000 1.1.2.3 --- addbiblio-nomarc.tmpl 10 Feb 2004 14:06:18 -0000 1.1.2.4 *************** *** 32,36 **** --- 32,36 ---- Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -C2 -r1.10.2.3 -r1.10.2.4 *** addbiblio.tmpl 28 Jan 2004 16:44:56 -0000 1.10.2.3 --- addbiblio.tmpl 10 Feb 2004 14:06:18 -0000 1.10.2.4 *************** *** 17,35 ****
Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** acquisitions-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- acquisitions-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

 

--- 1,3 ---- !

 

Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** cat-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- cat-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

 

--- 1,3 ---- !

 

Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -r1.12.2.1 -r1.12.2.2 *** cat-top.inc 20 Jan 2004 09:10:33 -0000 1.12.2.1 --- cat-top.inc 10 Feb 2004 14:06:17 -0000 1.12.2.2 *************** *** 90,97 **** 		! Ajouter une notice biblio ! Maintenance Cat
! Rayonnages virtuels ! Ajouter une notice biblio ! ! Maintenance Cat
! Ajouter un lecteur ! Ajouter une organisation
! Ajouter un lecteur ! Ajouter une organisation
Titre Séries:
! (if applicable)
Titre Séries:
! (si applicable)
! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
0
1
2
3
4
5
6
7
8
9
 "> ! ! Recherche Z39.50
! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
0
1
2
3
4
5
6
7
8
9
 "> ! ! ! ! ! ! Recherche Z39.50
+   + + +
>>>>
+ +
*************** *** 85,88 **** --- 100,115 ---- +
+ +
<<<<
+ + 		+ +
>>>>
+ +
*************** *** 110,113 **** --- 137,152 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 135,138 **** --- 174,189 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 160,163 **** --- 211,226 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 185,188 **** --- 248,263 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 210,213 **** --- 285,300 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 235,238 **** --- 322,337 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 260,263 **** --- 359,374 ---- + + + +
<<<<
+ + + + +
>>>>
+ + + *************** *** 285,288 **** --- 396,404 ---- + + +
<<<<
+ + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=oui'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=oui'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** addbooks.tmpl 28 Jan 2004 16:44:56 -0000 1.3.2.3 --- addbooks.tmpl 10 Feb 2004 14:06:18 -0000 1.3.2.4 *************** *** 22,26 **** ISBN: ! Si l'ISBN ou le titre est trouvé dans la table biblio, il sera récupéré et peut être modifié.
Si l'ISBN ou le titre existe déjà dans le réservoir, il va être récupéré et une notice biblio sera ajoutée.
--- 22,26 ---- ISBN: ! Si l'ISBN ou le titre est trouvé dans la table biblio, il sera récupéré et peut être modifié.
Si l'ISBN ou le titre existe déjà dans le réservoir, il va être récupéré et une notice biblio sera ajoutée.
*************** *** 32,38 ****   ! Créer une notice biblio vide ! Créer une notice biblio vide --- 32,38 ----   ! Créer une notice biblio vide ! Créer une notice biblio vide *************** *** 52,56 **** Mot-clé: ! --- 52,56 ---- Mot-clé: ! Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/additem-nomarc.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** additem-nomarc.tmpl 28 Jan 2004 16:44:56 -0000 1.1.2.3 --- additem-nomarc.tmpl 10 Feb 2004 14:06:18 -0000 1.1.2.4 *************** *** 117,121 **** ! OU Ajouter to a new Groupe: --- 117,121 ---- ! OU Add to a new Groupe: *************** *** 181,185 **** ! Nombre: --- 181,185 ---- ! Nombre;LIMITED: Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** isbnsearch.tmpl 28 Jan 2004 16:44:57 -0000 1.2.2.3 --- isbnsearch.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 5,9 **** Résultats trouvés
! Résultats to displayed

--- 5,9 ---- Résultats trouvés
! Résultats to affiché

*************** *** 46,50 **** ! ">Ajouter Ouvrages ">Editer... --- 46,50 ---- ! ">Ajouter items ">Editer... Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/marcimport.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** marcimport.tmpl 28 Jan 2004 16:44:57 -0000 1.2.2.3 --- marcimport.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 14,18 ****

pas importé, car déjà existant dans la base de données

pas importé, car déjà existant dans le réservoir

!

not imported because they seems not to be MARC format (ou ISBN/ISSN missing) !

enregistrements étudiés

Retour vers acquisition --- 14,18 ----

pas importé, car déjà existant dans la base de données

pas importé, car déjà existant dans le réservoir

!

pas importé, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) !

enregistrements étudiés

Retour vers acquisition *************** *** 40,44 **** ! Character encoding (MARC21 ou UNIMARC)
--- 40,44 ---- ! Codage des caractères (MARC21 ou UNIMARC)
From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/search.marc search.tmpl,1.4.2.3,1.4.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/search.marc Modified Files: Tag: rel_2_0 search.tmpl Log Message: french translation fixes Index: search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** search.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- search.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 14,25 **** "> ! ! ! ! --- 56,60 ---- ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-main.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-main.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-main.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 42,46 **** Cette bibliothèque fonctionne avec Koha SIGB sous licence libre, respectant les standards de l'internet ! XHTML 1\.0 valide

--- 42,46 ---- Cette bibliothèque fonctionne avec Koha SIGB sous licence libre, respectant les standards de l'internet ! XHTML 1.0 valide

Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-moredetail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-moredetail.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-moredetail.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 55,59 **** --- 55,59 ---- *************** *** 72,76 **** Vu:
Dernier prêt:
! on issue bit Dernier emprunteur 1:
Dernier emprunteur 2:
--- 72,76 ---- Vu:
Dernier prêt:
! En prêt \? Dernier emprunteur 1:
Dernier emprunteur 2:
Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-reserve.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-reserve.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-reserve.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 16,20 ****

Il y a Réservations déjà faites sur cet ouvrage

!

Sélectionnez les types d'ouvrages souhaités\. Le premier disponible sera gardé pour vous\.

--- 16,20 ----

Il y a Réservations déjà faites sur cet ouvrage

!

Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous.

Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-searchresults.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** opac-searchresults.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.3 --- opac-searchresults.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.4 *************** *** 63,67 **** ! --- 63,67 ---- ! *************** *** 145,149 ****

! Essayez une autre LIMITED:chercher

--- 145,149 ----

! Essayez une autre chercher

Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-userupdate.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** opac-userupdate.tmpl 8 Jan 2004 16:02:40 -0000 1.1.2.1 --- opac-userupdate.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.2 *************** *** 4,8 ****

Modification informations lecteur

Changer le nécessaire
! Your changes won't appear until the library has validated them.

--- 4,8 ----

Modification informations lecteur

Changer le nécessaire
! Vos changement n'apparaitront que lorsque la bibliothèque les aura validé

Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/subject.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** subject.tmpl 8 Jan 2004 16:02:40 -0000 1.1.2.1 --- subject.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.2 *************** *** 15,19 ****
AIDE :
--- 14,25 ---- "> ! ! ! ! --- 28,33 ---- !
AIDE :
*************** *** 28,32 ****
! From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/user userpage.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/user Modified Files: Tag: rel_2_0 userpage.tmpl Log Message: french translation fixes Index: userpage.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** userpage.tmpl 28 Jan 2004 16:45:31 -0000 1.1.2.3 --- userpage.tmpl 10 Feb 2004 14:06:51 -0000 1.1.2.4 *************** *** 11,15 ****
!
Reserves
Vous avez les livres suivants en attente: --- 11,15 ---- ! ! --- 20,24 ---- ! From tipaul at users.sourceforge.net Tue Feb 10 15:07:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/members imemberentry.tmpl,1.5.2.3,1.5.2.4 memberentry.tmpl,1.8.2.3,1.8.2.4 member-password.tmpl,1.2.2.1,1.2.2.2 member.tmpl,1.7.2.3,1.7.2.4 moremember.tmpl,1.13.2.3,1.13.2.4 pay.tmpl,1.5.2.3,1.5.2.4 readingrec.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/members Modified Files: Tag: rel_2_0 imemberentry.tmpl memberentry.tmpl member-password.tmpl member.tmpl moremember.tmpl pay.tmpl readingrec.tmpl Log Message: french translation fixes Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/imemberentry.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** imemberentry.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- imemberentry.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 116,120 **** --- 116,120 ---- *************** *** 124,128 **** !

 

--- 124,128 ---- !

 

Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -r1.8.2.3 -r1.8.2.4 *** memberentry.tmpl 28 Jan 2004 16:45:32 -0000 1.8.2.3 --- memberentry.tmpl 10 Feb 2004 14:06:52 -0000 1.8.2.4 *************** *** 1,11 **** -

Ajouter un lecteur Mise à jour du lecteur !


--- 1,14 ---- +

Ajouter un lecteur +

+

Mise à jour du lecteur +

!
Index: member-password.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** member-password.tmpl 20 Jan 2004 09:11:08 -0000 1.2.2.1 --- member-password.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.2 *************** *** 11,20 **** > ! Vous have entered a UserID that already exists. Please choose another one.
Nouvel identifiant utilisateur: >
Nouveau Mot de passe: >

! --- 11,20 ---- > ! Vous avez entered a UserID that already exists. Please choose another one.
Nouvel identifiant utilisateur: >
Nouveau Mot de passe: >

! Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -C2 -r1.7.2.3 -r1.7.2.4 *** member.tmpl 28 Jan 2004 16:45:32 -0000 1.7.2.3 --- member.tmpl 10 Feb 2004 14:06:52 -0000 1.7.2.4 *************** *** 7,11 ****
! --- 7,11 ----
! Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl,v retrieving revision 1.13.2.3 retrieving revision 1.13.2.4 diff -C2 -r1.13.2.3 -r1.13.2.4 *** moremember.tmpl 28 Jan 2004 16:45:32 -0000 1.13.2.3 --- moremember.tmpl 10 Feb 2004 14:06:52 -0000 1.13.2.4 *************** *** 25,29 **** N° Lecteur:
Catégorie Lecteur:
! Frais:$30/year, Paid
Joined: , Expires:
Annexe d'inscription:

--- 25,29 ---- N° Lecteur:
Catégorie Lecteur:
! Frais:$30/année, Payé
Joined: , Expires:
Annexe d'inscription:

*************** *** 53,57 ****

! Notes générales:

--- 53,57 ----

! Notes générales:

*************** *** 61,65 ****
! --- 61,65 ----
! Index: pay.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** pay.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- pay.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 39,43 ****

Réservations
Vous avez les livres suivants en attente: From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/reports reports-home.tmpl,1.2.2.1,1.2.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/reports Modified Files: Tag: rel_2_0 reports-home.tmpl Log Message: french translation fixes Index: reports-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** reports-home.tmpl 20 Jan 2004 09:14:53 -0000 1.2.2.1 --- reports-home.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.2 *************** *** 7,13 **** !
  • Jusqu'à la réconciliation: Daily Report (yesterday) !
  • Jusqu'à la réconciliation: Daily ! Report (today)
  • Ouvrages en retard --- 7,12 ---- !
    • Jusqu'à la réconciliation: Rapport quotidien (hier) !
    • Jusqu'à la réconciliation: Rapport quotidien (aujourd'hui)
    • Ouvrages en retard From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/marcimport AcceptItemCopy.tmpl,1.1.2.2,1.1.2.3 marcimportdetail.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/marcimport Modified Files: Tag: rel_2_0 AcceptItemCopy.tmpl marcimportdetail.tmpl Log Message: french translation fixes Index: AcceptItemCopy.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/Attic/AcceptItemCopy.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** AcceptItemCopy.tmpl 26 Jan 2004 10:47:57 -0000 1.1.2.2 --- AcceptItemCopy.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 2,6 ****
      ! Code barre '' has already been assigned.

      --- 2,6 ----

      ! Code barre a déjà été affecté.

      Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/Attic/marcimportdetail.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** marcimportdetail.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- marcimportdetail.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 20,24 ****

Titre Séries" size=40 maxlenght=255>
Volume" size=40 maxlenght=255>
Nombre" size=40 maxlenght=255>
Date Volume" size=40 maxlenght=255>
Description Volume" size=40 maxlenght=255>
Titre Séries" size=40 maxlenght=255>
Volume" size=40 maxlenght=255>
Nombre;LIMITED" size=40 maxlenght=255>
Date Volume" size=40 maxlenght=255>
Description Volume" size=40 maxlenght=255>
!
!
!

 

--- 39,43 ----
!

 

Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** readingrec.tmpl 20 Jan 2004 09:11:08 -0000 1.3.2.1 --- readingrec.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.2 *************** *** 19,23 **** 		/images/background-mem.gif"> ! &limit=">DATE DUE /images/background-mem.gif"> --- 19,23 ---- /images/background-mem.gif"> ! &limit=">DATE RETOUR /images/background-mem.gif"> From tipaul at users.sourceforge.net Tue Feb 10 15:07:46 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:46 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_60X.tmpl,1.2.2.2,1.2.2.3 unimarc_field_700_701_702.tmpl,1.1.2.2,1.1.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22441/koha-tmpl/intranet-tmpl/default/fr/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: french translation fixes Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -r1.2.2.2 -r1.2.2.3 *** unimarc_field_60X.tmpl 26 Jan 2004 10:48:53 -0000 1.2.2.2 --- unimarc_field_60X.tmpl 10 Feb 2004 14:07:44 -0000 1.2.2.3 *************** *** 101,105 ****
"> ! "> Create a new authority/thesaurus entry : "> --- 101,105 ---- "> ! "> Create a new authority/thesaurus entry : "> Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/Attic/unimarc_field_700_701_702.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** unimarc_field_700_701_702.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- unimarc_field_700_701_702.tmpl 10 Feb 2004 14:07:44 -0000 1.1.2.3 *************** *** 29,33 **** "> ! Insérer une nouvelle autorité : "> --- 29,33 ---- "> ! Insérer une nouvelle autorité : "> From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318/koha-tmpl/intranet-tmpl/default/fr/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE ---
Notice bibliographique



Publié par : en , ,
Collection:
Sujet:
Année :
Notes:
Titre uniforme:
Dewey: ">
Classification:
LCCN:
URL: ">
ISBN:
,
From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha detailprint.pl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318 Added Files: Tag: rel_2_0 detailprint.pl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE --- #!/usr/bin/perl # NOTE: Use standard 8-space tabs for this file (indents are 4 spaces) # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA use HTML::Template; use strict; require Exporter; use C4::Context; use C4::Output; # contains gettemplate use CGI; use C4::Search; use C4::Auth; use C4::Interface::CGI::Output; use C4::Date; my $query=new CGI; my $type=$query->param('type'); ($type) || ($type='intra'); my $biblionumber=$query->param('bib'); # change back when ive fixed request.pl my @items = ItemInfo(undef, $biblionumber, $type); my $norequests = 1; foreach my $itm (@items) { $norequests = 0 unless $itm->{'notforloan'}; } my $dat=bibdata($biblionumber); my ($authorcount, $addauthor)= &addauthor($biblionumber); my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber); my ($websitecount, @websites) = &getwebsites($biblionumber); $dat->{'count'}=@items; $dat->{'norequests'} = $norequests; $dat->{'additional'}=$addauthor->[0]->{'author'}; for (my $i = 1; $i < $authorcount; $i++) { $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'}; } # for my @results; $results[0]=$dat; my $resultsarray=\@results; my $itemsarray=\@items; my $webarray=\@webbiblioitems; my $sitearray=\@websites; my $startfrom=$query->param('startfrom'); ($startfrom) || ($startfrom=0); my ($template, $loggedinuser, $cookie) = get_template_and_user({ template_name => ('catalogue/detailprint.tmpl'), query => $query, type => "intranet", authnotrequired => ($type eq 'opac'), flagsrequired => {catalogue => 1}, }); my $count=1; # now to get the items into a hash we can use and whack that thru my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20); my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0); $template->param(startfrom => $startfrom+1, endat => $startfrom+20, numrecords => $count, nextstartfrom => $nextstartfrom, prevstartfrom => $prevstartfrom, BIBLIO_RESULTS => $resultsarray, ITEM_RESULTS => $itemsarray, WEB_RESULTS => $webarray, SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, biblionumber => $biblionumber, ); output_html_with_http_headers $query, $cookie, $template->output; # Local Variables: # tab-width: 8 # End: From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318/koha-tmpl/intranet-tmpl/default/en/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE ---
BIBLIO RECORD



Published by : in , ,
Collection:
Subject:
Year :
Notes:
Unititle:
Dewey: ">
Classification:
LCCN:
URL: ">
ISBN:
,
From tipaul at users.sourceforge.net Tue Feb 10 17:43:44 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 08:43:44 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr opac-auth.tmpl,1.1.2.2,1.1.2.3 opac-detail.tmpl,1.1.2.2,1.1.2.3 opac-main.tmpl,1.1.2.2,1.1.2.3 opac-moredetail.tmpl,1.1.2.2,1.1.2.3 opac-reserve.tmpl,1.1.2.2,1.1.2.3 opac-searchresults.tmpl,1.1.2.3,1.1.2.4 opac-userupdate.tmpl,1.1.2.1,1.1.2.2 subject.tmpl,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26103/koha-tmpl/opac-tmpl/css/fr Modified Files: Tag: rel_2_0 opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-searchresults.tmpl opac-userupdate.tmpl subject.tmpl Log Message: french translation fixes Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-auth.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-auth.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-auth.tmpl 10 Feb 2004 16:43:41 -0000 1.1.2.3 *************** *** 3,22 **** !

Désolé, je pense que vous n'avez pas les permissions suffisantes\.

!

Déconnecté\. Identifiez vous à nouveau\.

!

Vous avez changé d'adresse IP\. Identifiez vous à nouveau

!

Identifiant ou mot de passe erroné\. Essayez encore\.

--- 3,22 ---- !

Désolé, je pense que vous n'avez pas les permissions suffisantes.

!

Déconnecté. Identifiez vous à nouveau.

!

Vous avez changé d'adresse IP. Identifiez vous à nouveau

!

Identifiant ou mot de passe erroné. Essayez encore.

Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-detail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-detail.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-detail.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 56,60 ****

CODE BARRE !
CODE BARRE !
© Nombre d'ouvragesLIMITED:Localisation  
© Nombre d'ouvragesLocalisation  

! Results à de réponses
--- 15,19 ----
! Résultats à de réponses
From tipaul at users.sourceforge.net Tue Feb 10 15:07:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters admin-home.tmpl,1.5.2.3,1.5.2.4 aqbookfund.tmpl,1.4.2.3,1.4.2.4 aqbudget.tmpl,1.4.2.3,1.4.2.4 authorised_values.tmpl,1.6.2.3,1.6.2.4 branches.tmpl,1.6.2.3,1.6.2.4 categorie.tmpl,1.5.2.3,1.5.2.4 categoryitem.tmpl,1.1.2.2,1.1.2.3 charges.tmpl,1.1.2.3,1.1.2.4 checkmarc.tmpl,1.3.2.3,1.3.2.4 currency.tmpl,1.1.2.2,1.1.2.3 itemtypes.tmpl,1.2.2.3,1.2.2.4 marc_subfields_structure.tmpl,1.3.2.3,1.3.2.4 marctagstructure.tmpl,1.7.2.3,1.7.2.4 printers.tmpl,1.1.2.3,1.1.2.4 stopwords.tmpl,1.2.2.3,1.2.2.4 systempreferences.tmpl,1.3.2.2,1.3.2.3 thesaurus.tmpl,1.5.2.3,1.5.2.4 z3950servers.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: Tag: rel_2_0 admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: french translation fixes Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** admin-home.tmpl 28 Jan 2004 16:45:31 -0000 1.5.2.3 --- admin-home.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 2,12 ****

Paramètres


!
Paramètres système
! --- 2,14 ----

Paramètres


!
Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
Annexes
Paramètres système
! ! + *************** *** 56,63 **** ! --- 58,67 ---- + + ! *************** *** 75,90 ****
Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
AnnexesContrôle la structure MARC. A utiliser avant de travailler avec de vraies données. Cela permet de mettre en évidence les erreurs qui peuvent corrompre la base de données.
Divers paramètres
ImprimantesImprimantes (UNIX paths).
Contrôle la structure MARC. A utiliser avant de travailler avec de vraies données. Cela permet de mettre en évidence les erreurs qui peuvent corrompre la base de données.
Divers paramètres
ImprimantesImprinantes (chemin UNIX).
!
Outils
! --- 79,98 ----
Export
Exporter une notice biblio MARC Exporter en format MARC.
Importer
Charger des notices MARC dans le réservoir
!
Outils
! ! + + + Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** aqbookfund.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- aqbookfund.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 3,7 ****

Admin Compte

method=post> !
Votre recherche sur


--- 3,7 ----

Admin Compte

method=post> !
Votre recherche sur


*************** *** 24,28 ****

! --- 24,28 ---- ! *************** *** 43,47 ****       

!

 

--- 43,47 ----       

!

 

*************** *** 64,68 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 64,68 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 130,134 **** !

 

--- 130,134 ---- !

 

Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** aqbudget.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- aqbudget.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 3,7 ****

Admin Budget

!
Votre recherche sur


--- 3,7 ----

Admin Budget

!
Votre recherche sur


*************** *** 23,27 ****

!
--- 23,27 ----

!
*************** *** 43,47 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 43,47 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 92,102 **** !

!
Export
Exporter une notice biblio MARC Exporter en format MARC.
Importer
Charger des notices MARC dans le réservoir   Budget">//images/filenew.png" ALT="Ajouter budget" border=0>
  Budget">//images/filenew.png" ALT="Add budget" border=0>
Nom
CONFIRMER SUPPRESSION
Nom
CONFIRMER SUPPRESSION
Date de début () 
Date de fin ()
Montant budget
 ">
!

 

--- 92,102 ---- ! Date de début ()  ! Date de fin () Montant budget  "> !

 

Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -r1.6.2.3 -r1.6.2.4 *** authorised_values.tmpl 28 Jan 2004 16:45:31 -0000 1.6.2.3 --- authorised_values.tmpl 10 Feb 2004 14:06:52 -0000 1.6.2.4 *************** *** 51,56 ****

Admin Valeurs autorisées

Cette table est utilisée dans les définitions MARC. Vous pouvez définir autant de catégories et autant de valeurs autorisées pour chaque catégorie que vous voulez.

!

When you define the MARC subfield structure, you can link a subfield to an authorised-value category. When the user adds ou modifies a biblio, ! the subfield is not entered à a free field, but though a list sur authorised values.

Nouvelle catégorie... --- 51,55 ----

Admin Valeurs autorisées

Cette table est utilisée dans les définitions MARC. Vous pouvez définir autant de catégories et autant de valeurs autorisées pour chaque catégorie que vous voulez.

!

Quand vous définissez la structure des sous-champs MARC, vous pouvez lier un sous-champ à une catégorie de valeurs autorisées. Quand l'utilisateur ajoute ou modifie une notice biblio, la valeur du sous-champ n'est pas libre, mais doit appartenir à la liste des valeurs autorisées.

Nouvelle catégorie... Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -r1.6.2.3 -r1.6.2.4 *** branches.tmpl 28 Jan 2004 16:45:32 -0000 1.6.2.3 --- branches.tmpl 10 Feb 2004 14:06:52 -0000 1.6.2.4 *************** *** 1,5 **** !


--- 1,6 ---- ! !


*************** *** 57,61 ****   ! --- 58,62 ----   ! *************** *** 98,102 **** ! (nothing entered) --- 99,103 ---- ! (pas de saisie) *************** *** 116,120 **** ! (no categories set) --- 117,121 ---- ! (pas de catégorie définie) *************** *** 127,131 **** !
--- 128,132 ---- ! *************** *** 141,145 ****
method=post> !
--- 142,146 ----
method=post> !
Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** categorie.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- categorie.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 96,100 **** ! Période d'inscription --- 96,100 ---- ! Durée inscription *************** *** 102,106 **** ! Limite d'âge supérieure --- 102,106 ---- ! Age maxi *************** *** 108,112 **** ! Age obligatoire --- 108,112 ---- ! Age mini *************** *** 178,190 **** ! Période d'inscription ! Limite d'âge supérieure ! Age obligatoire --- 178,190 ---- ! Durée inscription ! Age maxi ! Age mini *************** *** 194,201 **** - en gros - - - Frais d'inscription --- 194,197 ---- *************** *** 238,242 **** Donnée effacée !
--- 234,238 ---- Donnée effacée !
*************** *** 247,269 ****

Admin Catégorie

! Votre recherche sur !
! > !
! ! ! ! ! ! ! --- 243,264 ----

Admin Catégorie

! Votre recherche sur ! ! > ! !
Catégorie DescriptionInscriptionLimite d'âge supérieureAge obligatoire Amendeen grosFraisEn retard Limite de prêt Réserver
! ! ! ! ! *************** *** 276,285 **** ! ! ! --- 271,284 ---- + ! Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/categoryitem.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** categoryitem.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- categoryitem.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 93,97 **** ! ! ! ! ! ! ! ! ! ! ! --- 181,193 ---- ! ! ! *************** *** 201,205 **** ! --- 201,205 ---- ! *************** *** 255,259 **** > ! --- 255,259 ---- > ! *************** *** 263,272 **** ! ! ! --- 263,272 ---- ! ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** charges.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- charges.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 1,8 ****

! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, son cycle
! eg 1,7,7 = $1 fine, after 7 days, every 7 days

!

Note : fines are calculated by the fines2.pl script, located in misc directory. ! Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

--- 1,7 ----

! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours

!

Note : les amendes sont calculées par le misc/script fines2.pl. Demandez à votre administrateur de mettre ce script dans le crontab, après minuit, pour que les amendes soient calculées chaque nuit

Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** checkmarc.tmpl 28 Jan 2004 16:45:32 -0000 1.3.2.3 --- checkmarc.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.4 *************** *** 11,15 **** --- 11,15 ---- *************** *** 25,29 **** --- 25,29 ---- *************** *** 105,110 **** --- 105,110 ---- *************** *** 118,122 **** ! --- 118,122 ---- ! Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** currency.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- currency.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 164,168 **** > ! --- 164,168 ---- > ! *************** *** 182,187 **** ! ! --- 182,187 ---- ! ! Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** itemtypes.tmpl 28 Jan 2004 16:45:32 -0000 1.2.2.3 --- itemtypes.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.4 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 81,90 **** ! ! --- 81,99 ---- ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** marc_subfields_structure.tmpl 28 Jan 2004 16:45:32 -0000 1.3.2.3 --- marc_subfields_structure.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.4 *************** *** 11,15 ****
Catégorie DescriptionDurée inscriptionFrais d'inscriptionAge maxiAge mini AmendeSignaler retard Limite de prêt Réserver OuiNon ! Oui ! ! Non ! !
Période d'inscription > --- 93,97 ----
Durée d'inscription > *************** *** 99,103 ****
Limite d'âge supérieure > --- 99,103 ----
Age maxi > *************** *** 105,109 ****
Age obligatoire > --- 105,109 ----
Age mini > *************** *** 123,127 ****
Frais d'inscription > --- 123,127 ----
Frais inscription > *************** *** 181,193 ****
Période d'inscription
Limite d'âge supérieure
Age obligatoire
Durée d'inscription
Age maxi
Age mini
Frais d'inscription
Frais inscription
Description InscriptionLimite d'âge supérieureAge obligatoire Amende en gros FraisEn retard Limite de prêt RéserverDescription InscriptionAge maxiAge mini Amende en gros FraisSignaler retard Limite de prêt Réserver
itemnum
  • Le champ itemnumb DOIT être connecté
    • !
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    itemnum
  • Le champ itemnumb DOIT être connecté
    • !
  • Le sous-champ correspondant DOIT être dans l'onglet -1 (ignore)
    		•
    TOUS les champs ouvrage DOIVENT :
  • être relié à la même étiquette,
    • !
  • et they doit tous be in the 10 (items) tab
    		•
    TOUS les champs ouvrage DOIVENT :
  • être relié à la même étiquette,
    • !
  • et ils doivent tous être dans l'onglet 10 (items)
    		•
    Les champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
  • être relié à l'étiquette MARC,
    • !
  • be in the SAME tag (for example : 090$a et 090$b)
    • !
  • \$etre dans l'onglet -1 \(items\)
    		•
    Les champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
  • être relié à l'étiquette MARC,
    • !
  • être dans la MEME étiquette (par ex. : 090$a et 090$b)
    • !
  • être dans l'onglet -1 (items)
    		•
    TOTALVous have error(s) in your MARC configuration. Please fix them before using koha
    TOTALVous avez erreurs dans votre configuration MARC. Corrigez-les avant d'utiliser Koha
    EditerSupprimer
    EditerSupprimer
    Non empruntablechecked value=1> (if checked, no item sur this type can be issued. ! If not checked, every item sur this type can be issued unless notforloan is set for a specific item)
    Durée de prêt (meaningful only if not for loan is not set)
    Non empruntable ! ! ! ! ! ! Si coché, aucun ouvrage de ce type ne peut être emprunté. Sinon, les ouvrages peuvent être empruntés sauf si le champ "notforloan" de l'ouvrage est coché. !
    Durée de prêt ! ! Utilisé seulement si "Non empruntable" n'est pas coché. !
    ! --- 11,15 ----
    ChampLib for librarians / for opac Repet obligatoire
    ! *************** *** 68,75 **** ! MARC subfield structure admin for !

    This screen shows the subfields associated with the selected tag. Vous can edit subfields ou ajouter a new one by clicking on "edit".

    !

    The column champ Koha shows that the subfield is linked with a "champ Koha". Koha can manage a MARC interface, ou a Koha interface. This link ensures that ! both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    ChampLibellé OPAC Repet obligatoire
    --- 68,74 ---- !

    MARC subfield structure admin for

    !

    This screen shows the subfields associated with the selected tag. Vous can edit subfields ou add a new one by clicking on edit.

    !

    The column champ Koha shows that the subfield is linked with a champ Koha. Koha can manage a MARC interface, ou a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    *************** *** 78,84 **** ! ! ! --- 77,83 ---- ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -C2 -r1.7.2.3 -r1.7.2.4 *** marctagstructure.tmpl 28 Jan 2004 16:45:32 -0000 1.7.2.3 --- marctagstructure.tmpl 10 Feb 2004 14:06:52 -0000 1.7.2.4 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 59,67 ****
    Lib champ Koha ?Rep ?obligatoire ?Onglet ? Valeur autorisée ? Thésaurus ?Lib champ Koha ?Rep ?obligatoire ?Onglet ? Valeur autorisée ? Thésaurus ?
    ! ! !
    Etiquette
    Lib for librarians
    Lib for opac
    Répétable
    Obligatoire
    Valeur autorisée (if you select a value ici, the indicators will be limited to the authorised value list)
     
    --- 59,67 ---- ! ! !
    Etiquette
    Libellé bibliothécaire
    Lib pour l'opac
    Répétable
    Obligatoire
    Valeur autorisée (Si vous sélectionnez une valeur ici, les indicateurs seront limités une liste de valeurs autorisées)
     
    *************** *** 97,101 ****
    !
    --- 97,101 ----
    !
    Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** printers.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- printers.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 155,159 ****
    > !
    --- 155,159 ----
    > !
    Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** stopwords.tmpl 28 Jan 2004 16:45:32 -0000 1.2.2.3 --- stopwords.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 133,137 ****
    > !
    --- 133,137 ----
    > !
    Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** systempreferences.tmpl 26 Jan 2004 10:48:53 -0000 1.3.2.2 --- systempreferences.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.3 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 56,60 **** !

    Modifier une préférence système

    --- 56,60 ---- !

    Modifier une préférence système

    *************** *** 78,82 **** ! Donnée enregistrée
    --- 78,82 ---- ! Donnée enregistrée *************** *** 86,92 **** ! ! --- 86,92 ---- !
    Variable
    ! *************** *** 95,99 **** !
    Variable
    CONFIRMER SUPPRESSION
    --- 95,99 ----
    CONFIRMER SUPPRESSION !
    *************** *** 101,105 **** ! Donnée effacée
    --- 101,105 ---- ! Donnée effacée *************** *** 108,121 **** !

    Admin Préférences système

    !
    ! --- 108,121 ---- !

    Admin Préférences système

    !
    Variable Valeur
    ! Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** thesaurus.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- thesaurus.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 6,10 ****
    Variable Valeur
    !
    Values related to ()
    --- 6,10 ---- !
    En liaison avec ()
    *************** *** 29,33 **** "> "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Ajouter" BORDER=0 >
    --- 29,33 ---- "> "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Add" BORDER=0 >
    *************** *** 99,104 ****

    Gestion du thésaurus et des fichiers autorités.

      ! Extraire: see data dependent one this one
      ! Lié: see other forms sur this authority entry

    --- 99,104 ----

    Gestion du thésaurus et des fichiers autorités.

      ! Extraire: Voir les formes associées
      ! Lié: Voir les formes rejetées

    *************** *** 125,129 **** ! Extraire Lié ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> --- 125,129 ---- ! Extraire   Lié ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> *************** *** 137,142 **** ! !
    " class="button">Précédents" class="button"> Suivant
    --- 137,142 ---- ! !
    " class="button">Previous" class="button"> Next
    *************** *** 147,151 **** "> "> !

    --- 147,151 ---- "> "> !

    Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** z3950servers.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- z3950servers.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 128,136 **** ! Vérifié (searched by default) ! Rang (display order) --- 128,136 ---- ! Coché (recherche par défaut) ! Rang (ordre d'affichage) *************** *** 138,142 **** ! Syntaxe (z3950 can send enregistrements in various format. Choose one) *************** *** 228,232 ****
    > !
    --- 228,232 ----
    > !
    From tipaul at users.sourceforge.net Wed Feb 11 09:22:38 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:22:38 -0800 Subject: [Koha-cvs] CVS: koha/misc release_notes_200RC4.txt,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19999 Modified Files: Tag: rel_2_0 release_notes_200RC4.txt Log Message: synch'ing release notes Index: release_notes_200RC4.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/Attic/release_notes_200RC4.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** release_notes_200RC4.txt 10 Feb 2004 13:22:26 -0000 1.1.2.1 --- release_notes_200RC4.txt 11 Feb 2004 08:22:36 -0000 1.1.2.2 *************** *** 6,14 **** If you test it and let us know about any we haven't seen yet, it will help us to fix them. - The 2.0.x series version is "feature freezed". Only bugs or minor changes will be made in this branch. - The koha team is already working on the 2.2.x version. - In CVS (HEAD branch), developpers can already get 1st draft of a working z3950 server. - - INSTALLATION --- 6,9 ---- *************** *** 20,24 **** ! UPGRADE from previous 2.0.0preX version * Download the package --- 15,19 ---- ! UPGRADE from previous 2.0.0preX or RCx version * Download the package *************** *** 51,60 **** Now Koha 2.0.0RC4 is ready for you to test. - BUGFIXES/IMPROVEMENTS: BUGS FIXED: * indicators where stored but not displayed in MARC editor/viewer. * book shelves work again (note bookshelves are not avaible in OPAC. they will be added in 2.2.0) * it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and recieve a past order) * removing "bulk", useless field, in admin/categorie.pl list (NOT in DB, in case someone uses the field) --- 46,60 ---- Now Koha 2.0.0RC4 is ready for you to test. BUGFIXES/IMPROVEMENTS: BUGS FIXED: + major : + * #293 : Error Issuing Book - 1 (a very old one...) + * #605 : circulation.pl only shows one waiting item + * #661 : Set three variables for the circ template: gna, lost, and dbarred + * biblio deletion : in some cases, the biblio deletion was done on another biblio than the one asked. * indicators where stored but not displayed in MARC editor/viewer. * book shelves work again (note bookshelves are not avaible in OPAC. they will be added in 2.2.0) + minor : * it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and recieve a past order) * removing "bulk", useless field, in admin/categorie.pl list (NOT in DB, in case someone uses the field) *************** *** 62,70 **** * Next borrower didn't work in circulation.pl (didn't return to borrower form) * in circulation.pl, removing
    to have all informations without sidebar on a 1024x768 screen. ! * in curculation.pl, ODUES are in red in borrower header IMPROVEMENTS: * Minor translation & HTML fixes. * Adding >>> in biblio editor to change tab. ! ! DB change in RC2: --- 62,70 ---- * Next borrower didn't work in circulation.pl (didn't return to borrower form) * in circulation.pl, removing
    to have all informations without sidebar on a 1024x768 screen. ! * in circulation.pl, ODUES are in red in borrower header ! * quoting correctly titles with a " inside, in MARC editor IMPROVEMENTS: * Minor translation & HTML fixes. * Adding >>> in biblio editor to change tab. ! * Adding a "print" link in MARCbiblio : popup a small windows, print the biblio, and closes. Nice for libraries still having a paper catalog. \ No newline at end of file From tipaul at users.sourceforge.net Wed Feb 11 09:35:34 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:35:34 -0800 Subject: [Koha-cvs] CVS: koha detailprint.pl,1.1,1.2 catalogue-home.pl,1.9,1.10 detail.pl,1.22,1.23 insertidata.pl,1.5,1.6 memberentry.pl,1.38,1.39 newmember.pl,1.18,1.19 search.pl,1.33,1.34 shelves.pl,1.12,1.13 thesaurus_popup.pl,1.14,1.15 release_notes_191.txt,1.1,NONE release_notes_192.txt,1.1,NONE release_notes_193.txt,1.1,NONE release_notes_200pre1.txt,1.2,NONE release_notes_200pre2.txt,1.2,NONE release_notes_200pre3.txt,1.1,NONE release_notes_200pre4.txt,1.1,NONE release_notes_200pre5.txt,1.1,NONE release_notes_200RC1.txt,1.4,NONE Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22477 Modified Files: catalogue-home.pl detail.pl insertidata.pl memberentry.pl newmember.pl search.pl shelves.pl thesaurus_popup.pl Added Files: detailprint.pl Removed Files: release_notes_191.txt release_notes_192.txt release_notes_193.txt release_notes_200pre1.txt release_notes_200pre2.txt release_notes_200pre3.txt release_notes_200pre4.txt release_notes_200pre5.txt release_notes_200RC1.txt Log Message: synch'ing 2.0.0 branch and head Index: catalogue-home.pl =================================================================== RCS file: /cvsroot/koha/koha/catalogue-home.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** catalogue-home.pl 8 Aug 2003 13:46:26 -0000 1.9 --- catalogue-home.pl 11 Feb 2004 08:35:31 -0000 1.10 *************** *** 17,21 **** type => "intranet", authnotrequired => 0, ! flagsrequired => {parameters => 1}, debug => 1, }); --- 17,21 ---- type => "intranet", authnotrequired => 0, ! flagsrequired => {catalogue => 1}, debug => 1, }); Index: detail.pl =================================================================== RCS file: /cvsroot/koha/koha/detail.pl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** detail.pl 8 May 2003 13:19:40 -0000 1.22 --- detail.pl 11 Feb 2004 08:35:31 -0000 1.23 *************** *** 96,100 **** SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, ! biblionumber => $biblionumber); output_html_with_http_headers $query, $cookie, $template->output; --- 96,101 ---- SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, ! biblionumber => $biblionumber, ! ); output_html_with_http_headers $query, $cookie, $template->output; Index: insertidata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertidata.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** insertidata.pl 6 Jun 2003 10:00:52 -0000 1.5 --- insertidata.pl 11 Feb 2004 08:35:31 -0000 1.6 *************** *** 40,86 **** my $problems; my $env; foreach my $key (@names){ $data{$key}=$input->param($key); } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; ! my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ ! $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}', ! cardnumber='$data{'cardnumber_institution'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}', ! streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}', ! altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}', ! emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}', ! altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}', ! city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}', ! borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'institution_name'}', ! initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}', ! gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}', ! textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}', ! zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}' ! where borrowernumber=$data{'borrowernumber'}"; } else { my $surname=$data{'institution_name'}; ! $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, ! firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity, ! altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,guarantor,school,branchcode,zipcode,homezipcode) ! values ('','$data{'expiry'}','$data{'cardnumber_institution'}', ! '','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', ! '$data{'firstname'}','$data{'altnotes'}','','$data{'contactname'}', ! '$data{'emailaddress'}', ! now(),'$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}', ! '$data{'phoneday'}','I','$data{'city'}','$data{'area'}','$data{'phone'}', ! '$data{'borrowernotes'}','$data{'altphone'}','$surname','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','','','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } - #print $query; - my $sth2=$dbh->prepare($query); - warn "==> $query"; - $sth2->execute; $sth2->finish; ! #$sth->finish; print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}"); --- 40,107 ---- my $problems; my $env; + my $sth2; foreach my $key (@names){ $data{$key}=$input->param($key); } my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?"); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ ! $sth2=$dbh->prepare("update borrowers set title=?,expiry=?, ! cardnumber=?,sex=?,ethnotes=?, ! streetaddress=?,faxnumber=?,firstname=?, ! altnotes=?,dateofbirth=?,contactname=?, ! emailaddress=?,dateenrolled=?,streetcity=?, ! altrelationship=?,othernames=?,phoneday=?, ! city=?,area=?,phone=?, ! borrowernotes=?,altphone=?,surname=?, ! initials=?,physstreet=?,ethnicity=?, ! gonenoaddress=?,lost=?,debarred=?, ! textmessaging=?, branchcode = ?, ! zipcode = ?,homezipcode=? ! where borrowernumber=?"); ! $sth2->execute($data{'title'},$data{'expiry'}, ! $data{'cardnumber_institution'},$data{'sex'},$data{'ethnicnotes'}, ! $data{'address'},$data{'faxnumber'},$data{'firstname'}, ! $data{'altnotes'},$data{'dateofbirth'},$data{'contactname'}, ! $data{'emailaddress'},$data{'joining'},$data{'streetcity'}, ! $data{'altrelationship'},$data{'othernames'},$data{'phoneday'}, ! $data{'city'},$data{'area'},$data{'phone'}, ! $data{'borrowernotes'},$data{'altphone'},$data{'institution_name'}, ! $data{'initials'},$data{'streetaddress'},$data{'ethnicity'}, ! $data{'gna'},$data{'lost'},$data{'debarred'}, ! $data{'textmessaging'},$data{'branchcode'}, ! $data{'zipcode'},$data{'homezipcode'}, ! $data{'borrowernumber'}); } else { my $surname=$data{'institution_name'}; ! # note for code reading : 5 on each line ! $sth2=$dbh->prepare("insert into borrowers ( ! title, expiry, cardnumber, sex, ethnotes, ! streetaddress, faxnumber, firstname, altnotes, dateofbirth, ! contactname, emailaddress, dateenrolled, streetcity, altrelationship, ! othernames, phoneday, categorycode, city, area, ! phone, borrowernotes, altphone, surname, initials, ! ethnicity, borrowernumber,guarantor, school, branchcode, ! zipcode, homezipcode) ! values ( ?,?,?,?,?, ! ?,?,?,?,?, ! ?,?,now(),?,?, ! ?,?,?,?,?, ! ?,?,?,?,?, ! ?,?,?,?,?, ! ?,? ! )"); ! $sth2->execute('', $data{'expiry'}, $data{'cardnumber_institution'}, '', $data{'ethnotes'}, ! $data{'address'}, $data{'faxnumber'}, $surname, $data{'altnotes'}, '', ! $data{'contactname'},$data{'emailaddress'}, $data{'streetcity'}, $data{'altrelationship'}, # only 4 because of now() ! $data{'othernames'}, $data{'phoneday'}, 'I', $data{'city'}, $data{'area'}, ! ''.$data{'phone'}, $data{'borrowernotes'}, $data{'altphone'}, $surname, ''.$data{'initials'}, ! $data{'ethnicity'}, $data{'borrowernumber'}, '', '', $data{'branchcode'}, ! $data{'zipcode'}, $data{'homezipcode'}); } $sth2->finish; ! $sth->finish; print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}"); Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** memberentry.pl 31 Dec 2003 18:08:33 -0000 1.38 --- memberentry.pl 11 Feb 2004 08:35:31 -0000 1.39 *************** *** 60,67 **** print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member"); } else { # this else goes down the whole script ! if ($type ne 'Add'){ ! $template->param( header => 'Update Member Details'); # bad templating style } else { ! $template->param( header => 'Add New Member'); } --- 60,67 ---- print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member"); } else { # this else goes down the whole script ! if ($type eq 'Add'){ ! $template->param( addAction => 1); } else { ! $template->param( addAction =>0); } Index: newmember.pl =================================================================== RCS file: /cvsroot/koha/koha/newmember.pl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** newmember.pl 18 Dec 2003 17:02:13 -0000 1.18 --- newmember.pl 11 Feb 2004 08:35:31 -0000 1.19 *************** *** 127,133 **** my $sex; if ($data{'sex'} eq 'M'){ ! $sex="Male"; } else { ! $sex="Female"; } if ($data{'joining'} eq ''){ --- 127,133 ---- my $sex; if ($data{'sex'} eq 'M'){ ! $sex=1; } else { ! $sex=0; } if ($data{'joining'} eq ''){ Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.pl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** search.pl 19 Dec 2003 17:28:03 -0000 1.33 --- search.pl 11 Feb 2004 08:35:31 -0000 1.34 *************** *** 20,26 **** --- 20,35 ---- # $Log$ + # Revision 1.34 2004/02/11 08:35:31 tipaul + # synch'ing 2.0.0 branch and head + # # Revision 1.33 2003/12/19 17:28:03 tipaul # fix for #683 # + # Revision 1.32.2.2 2004/01/13 17:33:39 tipaul + # removing useless (& buggy here) checkauth + # + # Revision 1.32.2.1 2003/12/19 17:28:42 tipaul + # fix for 683 + # # Revision 1.32 2003/06/11 18:37:55 tonnesen # Using boolean_preference instead of preference for 'marc' setting *************** *** 43,50 **** my $type=$query->param('type'); - #(-e "opac") && ($type='opac'); - - my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0)); - my $startfrom=$query->param('startfrom'); ($startfrom) || ($startfrom=0); --- 52,55 ---- Index: shelves.pl =================================================================== RCS file: /cvsroot/koha/koha/shelves.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** shelves.pl 5 Feb 2003 10:04:14 -0000 1.12 --- shelves.pl 11 Feb 2004 08:35:31 -0000 1.13 *************** *** 5,10 **** # $Header$ # - - # Copyright 2000-2002 Katipo Communications # --- 5,8 ---- *************** *** 36,40 **** my $env; my $query = new CGI; - #print $query->header(-cookie => $cookie); my $headerbackgroundcolor='#663266'; my $circbackgroundcolor='#555555'; --- 34,37 ---- *************** *** 45,83 **** = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {parameters => 1}, ! }); ! #print startpage(); ! #print startmenu('catalogue'); ! #print "

    Logged in as: $loggedinuser [Log Out]

    \n"; ! ! ! my ($shelflist) = GetShelfList(); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); } - } } SWITCH: { ! $template->param({ loggedinuser => $loggedinuser, ! viewshelf => $query->param('viewshelf'), ! shelves => $query->param('shelves'), ! headerbackgroundcolor => $headerbackgroundcolor, ! circbackgroundcolor => $circbackgroundcolor }); ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 42,77 ---- = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {catalogue => 1}, ! }); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); ! } } } + my ($shelflist) = GetShelfList(); + $template->param({ loggedinuser => $loggedinuser, + headerbackgroundcolor => $headerbackgroundcolor, + circbackgroundcolor => $circbackgroundcolor }); SWITCH: { ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! } ! ! ($shelflist) = GetShelfList(); # rebuild shelflist in case a shelf has been added ! ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 87,106 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); - } - $template->param(shelvesloop => \@shelvesloop); } output_html_with_http_headers $query, $cookie, $template->output; - sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); } - } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { --- 81,98 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); } + $template->param(shelvesloop => \@shelvesloop); output_html_with_http_headers $query, $cookie, $template->output; sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); ! } } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { *************** *** 114,123 **** #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 106,115 ---- #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 127,143 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop); } - - sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 119,135 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop, ! shelves => 1, ! ); } sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 148,162 **** $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop); ! $template->param( shelfname => $shelflist->{$shelfnumber}->{'shelfname'}); ! $template->param( shelfnumber => $shelfnumber); } - #print endpage(); - #print endmenu('catalogue'); - # # $Log$ # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains --- 140,159 ---- $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop, ! shelfname => $shelflist->{$shelfnumber}->{'shelfname'}, ! shelfnumber => $shelfnumber, ! viewshelf => $query->param('viewshelf'), ! ); } # # $Log$ + # Revision 1.13 2004/02/11 08:35:31 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.12.2.1 2004/02/06 14:22:19 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains Index: thesaurus_popup.pl =================================================================== RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** thesaurus_popup.pl 12 Jan 2004 16:58:20 -0000 1.14 --- thesaurus_popup.pl 11 Feb 2004 08:35:31 -0000 1.15 *************** *** 37,40 **** --- 37,41 ---- my $result = $input->param('result'); my $search_string= $input->param('search_string'); + $search_string = $result unless ($search_string); my $op = $input->param('op'); my $id = $input->param('id'); *************** *** 42,46 **** my $index= $input->param('index'); my $insert = $input->param('insert'); ! my $dbh = C4::Context->dbh; --- 43,47 ---- my $index= $input->param('index'); my $insert = $input->param('insert'); ! my $nohierarchy = $input->param('nohierarchy'); # if 1, just show the last part of entry (Marseille). If 0, show everything (Europe -- France --Marseille) my $dbh = C4::Context->dbh; *************** *** 52,58 **** my ($father,$freelib_text) = $sti->fetchrow_array; if (length($result)>0) { ! $result .= "|$father $freelib_text"; } else { ! $result = "$father $freelib_text"; } } --- 53,67 ---- my ($father,$freelib_text) = $sti->fetchrow_array; if (length($result)>0) { ! if ($nohierarchy) { ! $result .= "|$freelib_text"; ! } else { ! $result .= "|$father $freelib_text"; ! } } else { ! if ($nohierarchy) { ! $result = "$freelib_text"; ! } else { ! $result = "$father $freelib_text"; ! } } } *************** *** 78,82 **** $sti->execute($search_string,$category); while (my $line=$sti->fetchrow_hashref) { ! $stdlib{$line->{'id'}} = "$line->{'father'} $line->{'freelib'}"; push(@freelib,$line->{'id'}); } --- 87,95 ---- $sti->execute($search_string,$category); while (my $line=$sti->fetchrow_hashref) { ! if ($nohierarchy) { ! $stdlib{$line->{'id'}} = "$line->{'freelib'}"; ! } else { ! $stdlib{$line->{'id'}} = "$line->{'father'} $line->{'freelib'}"; ! } push(@freelib,$line->{'id'}); } *************** *** 106,110 **** result => $result, category => $category, ! index => $index ); output_html_with_http_headers $input, $cookie, $template->output; --- 119,124 ---- result => $result, category => $category, ! index => $index, ! nohierarchy => $nohierarchy, ); output_html_with_http_headers $input, $cookie, $template->output; --- release_notes_191.txt DELETED --- --- release_notes_192.txt DELETED --- --- release_notes_193.txt DELETED --- --- release_notes_200pre1.txt DELETED --- --- release_notes_200pre2.txt DELETED --- --- release_notes_200pre3.txt DELETED --- --- release_notes_200pre4.txt DELETED --- --- release_notes_200pre5.txt DELETED --- --- release_notes_200RC1.txt DELETED --- From tipaul at users.sourceforge.net Wed Feb 11 09:40:12 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:12 -0800 Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.66,1.67 Message-ID: Update of /cvsroot/koha/koha/C4/Circulation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/C4/Circulation Modified Files: Circ2.pm Log Message: synch'ing 2.0.0 branch and head Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** Circ2.pm 19 Dec 2003 14:44:46 -0000 1.66 --- Circ2.pm 11 Feb 2004 08:40:10 -0000 1.67 *************** *** 635,639 **** $noissue=1; } else { ! $rejected=-1; last SWITCH; } --- 635,639 ---- $noissue=1; } else { ! $rejected="Item on issue to this borrower, and you have chosen not to renew"; last SWITCH; } *************** *** 669,673 **** my $branches = getbranches(); my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'}; ! if ($responses->{2} eq '') { $questionnumber=2; # FIXME - Assumes HTML --- 669,673 ---- my $branches = getbranches(); my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'}; ! if ($responses->{2} eq '' && $responses->{3} eq '') { $questionnumber=2; # FIXME - Assumes HTML *************** *** 676,680 **** last SWITCH; } elsif ($responses->{2} eq 'N') { ! $rejected=-1; last SWITCH; } else { --- 676,680 ---- last SWITCH; } elsif ($responses->{2} eq 'N') { ! $rejected="Issue cancelled"; last SWITCH; } else { From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21,1.22 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui.simple Modified Files: addbiblio.pl additem.pl Log Message: synch'ing 2.0.0 branch and head Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** addbiblio.pl 22 Dec 2003 19:16:58 -0000 1.33 --- addbiblio.pl 11 Feb 2004 08:40:11 -0000 1.34 *************** *** 161,164 **** --- 161,165 ---- sub create_input () { my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth) = @_; + $value =~ s/"/"/g; my $dbh = C4::Context->dbh; my %subfield_data; *************** *** 197,201 **** my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values ! where category=? order by authorised_value"); # loop through each tab 0 through 9 --- 198,202 ---- my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values ! where category=? order by lib"); # loop through each tab 0 through 9 *************** *** 213,218 **** my $value=$field->data(); my $subfield="@"; ! push(@subfields_data, &create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth)) ! unless ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); $i++; } else { --- 214,219 ---- my $value=$field->data(); my $subfield="@"; ! next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! push(@subfields_data, &create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth)); $i++; } else { *************** *** 231,236 **** next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! next if ($tag > 10 && defined($record->field($tag)->subfield($subfield))); ! next if ($tag < 10 && defined($record->field($tag)->data())); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); $i++; --- 232,237 ---- next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! next if ($tag<10); ! next if (defined($record->field($tag)->subfield($subfield))); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); $i++; *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $indicator; $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 241,245 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); *************** *** 325,329 **** type => "intranet", authnotrequired => 0, ! flagsrequired => {catalogue => 1}, debug => 1, }); --- 326,330 ---- type => "intranet", authnotrequired => 0, ! flagsrequired => {editcatalogue => 1}, debug => 1, }); Index: additem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** additem.pl 12 Jan 2004 17:00:09 -0000 1.21 --- additem.pl 11 Feb 2004 08:40:11 -0000 1.22 *************** *** 275,277 **** $template->param($error => 1); } ! output_html_with_http_headers $input, $cookie, $template->output; \ No newline at end of file --- 275,277 ---- $template->param($error => 1); } ! output_html_with_http_headers $input, $cookie, $template->output; From tipaul at users.sourceforge.net Wed Feb 11 09:40:12 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:12 -0800 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Catalogue.pm,1.37,1.38 Members.pm,1.2,1.3 Output.pm,1.46,1.47 Search.pm,1.85,1.86 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/C4 Modified Files: Biblio.pm BookShelves.pm Catalogue.pm Members.pm Output.pm Search.pm Log Message: synch'ing 2.0.0 branch and head Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -r1.78 -r1.79 *** Biblio.pm 9 Dec 2003 15:57:28 -0000 1.78 --- Biblio.pm 11 Feb 2004 08:40:09 -0000 1.79 *************** *** 567,571 **** return; } - # otherwise, skip through each subfield... my @fields = $record->fields(); --- 567,570 ---- *************** *** 695,699 **** $dbh->do("delete from marc_subfield_table where bibid='$bibid' and tag='$tag' and tagorder='$tagorder' ! and subfieldcode='$subfield' and subfieldorder='$subfieldorder "); } --- 694,698 ---- $dbh->do("delete from marc_subfield_table where bibid='$bibid' and tag='$tag' and tagorder='$tagorder' ! and subfieldcode='$subfield' and subfieldorder='$subfieldorder' "); } *************** *** 1435,1439 **** price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, --- 1434,1438 ---- price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! bulk =?, notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, *************** *** 1442,1446 **** $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'notforloan'}); } else { $sth=$dbh->prepare("Insert into items set --- 1441,1445 ---- $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); } else { $sth=$dbh->prepare("Insert into items set *************** *** 1451,1455 **** price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, --- 1450,1454 ---- price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! bulk = ? , notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, *************** *** 1458,1462 **** $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'notforloan'}); } if (defined $sth->errstr) { --- 1457,1461 ---- $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); } if (defined $sth->errstr) { *************** *** 1472,1477 **** # my $dbh=C4Connect; $item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'}; ! my $query="update items set barcode=?,itemnotes=? where itemnumber=?"; ! my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'itemnum'}); if ($item->{'barcode'} eq ''){ $item->{'notforloan'}=0 unless $item->{'notforloan'}; --- 1471,1476 ---- # my $dbh=C4Connect; $item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'}; ! my $query="update items set barcode=?,itemnotes=?,bulk=?,notforloan=? where itemnumber=?"; ! my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); if ($item->{'barcode'} eq ''){ $item->{'notforloan'}=0 unless $item->{'notforloan'}; *************** *** 1485,1491 **** homebranch=?, itemlost=?, ! wthdrawn=? where itemnumber=?"; ! @bind = ($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'itemnum'}); } if ($item->{'replacement'} ne ''){ --- 1484,1492 ---- homebranch=?, itemlost=?, ! wthdrawn=?, ! bulk=?, ! notforloan=?, where itemnumber=?"; ! @bind = ($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); } if ($item->{'replacement'} ne ''){ *************** *** 1557,1561 **** } $query =~ s/\,$//; - warn "Q 1560 : $query"; my $sth2=$dbh->prepare($query); $sth2->execute(@bind); --- 1558,1561 ---- *************** *** 1582,1586 **** #replacing the last , by ",?)" $query=~ s/\,$//; - warn "Q olddelbiblio : $query"; $sth=$dbh->prepare($query); $sth->execute(@bind); --- 1582,1585 ---- *************** *** 2193,2196 **** --- 2192,2208 ---- # $Id$ # $Log$ + # Revision 1.79 2004/02/11 08:40:09 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.78.2.3 2004/02/10 13:15:46 tipaul + # removing 2 warnings + # + # Revision 1.78.2.2 2004/01/26 10:38:06 tipaul + # dealing correctly "bulk" field + # + # Revision 1.78.2.1 2004/01/13 17:29:53 tipaul + # * minor html fixes + # * adding publisher in acquisition process (& ordering basket by publisher) + # # Revision 1.78 2003/12/09 15:57:28 tipaul # rolling back to working char_decode sub Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** BookShelves.pm 15 Dec 2003 10:57:08 -0000 1.11 --- BookShelves.pm 11 Feb 2004 08:40:09 -0000 1.12 *************** *** 145,163 **** #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! my $sth=$dbh->prepare("select * from shelfcontents ! where shelfnumber=? and itemnumber=?"); ! ! $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents ! (shelfnumber, itemnumber, flags) values (?, ?, 0)"); - # FIXME - The default for 'flags' is NULL. - # Why set it to 0? $sth->execute($shelfnumber, $itemnumber); ! } } --- 145,159 ---- #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! return unless $itemnumber; ! my $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); ! $sth->execute($shelfnumber, $itemnumber); ! } } *************** *** 244,247 **** --- 240,249 ---- # # $Log$ + # Revision 1.12 2004/02/11 08:40:09 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.11 2003/12/15 10:57:08 slef # DBI call fix for bug 662 Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** Catalogue.pm 17 Dec 2003 01:28:31 -0000 1.37 --- Catalogue.pm 11 Feb 2004 08:40:10 -0000 1.38 *************** *** 112,116 **** $sth->execute($basketno); } ! my @results = (); while (my $data=$sth->fetchrow_hashref){ push(@results,$data); --- 112,121 ---- $sth->execute($basketno); } ! $query.=" order by biblioitems.publishercode"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my @results; ! # print $query; ! my $i=0; while (my $data=$sth->fetchrow_hashref){ push(@results,$data); Index: Members.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Members.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Members.pm 15 Dec 2003 16:19:14 -0000 1.2 --- Members.pm 11 Feb 2004 08:40:10 -0000 1.3 *************** *** 67,73 **** my $autonumber_members = C4::Context->boolean_preference('autoMemberNum'); $autonumber_members = 0 unless defined $autonumber_members; - - warn "autoMemberNum is $autonumber_members\n"; - # Find out whether member numbers should be generated # automatically. Should be either "1" or something else. --- 67,70 ---- Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -r1.46 -r1.47 *** Output.pm 10 Feb 2004 00:43:21 -0000 1.46 --- Output.pm 11 Feb 2004 08:40:10 -0000 1.47 *************** *** 76,80 **** #FIXME: this is a quick fix to stop rc1 installing broken #Still trying to figure out the correct fix. ! my $path = C4::Context->config('intrahtdocs')."/intranet-tmpl/default/en/includes/"; #--------------------------------------------------------------------------------------------------------- --- 76,80 ---- #FIXME: this is a quick fix to stop rc1 installing broken #Still trying to figure out the correct fix. ! my $path = C4::Context->config('intrahtdocs')."/default/en/includes/"; #--------------------------------------------------------------------------------------------------------- Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -r1.85 -r1.86 *** Search.pm 14 Dec 2003 17:25:37 -0000 1.85 --- Search.pm 11 Feb 2004 08:40:10 -0000 1.86 *************** *** 1146,1150 **** } else { if ($type eq 'subject'){ ! $query .= "group by subject order by subject "; } } --- 1146,1150 ---- } else { if ($type eq 'subject'){ ! $query .= "order by subject group by subject "; } } *************** *** 1350,1358 **** } ! my $class = $data->{'classification'}; my $dewey = $data->{'dewey'}; $dewey =~ s/0+$//; ! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general ! # books about computer science if ($dewey < 10){$dewey='00'.$dewey;} if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;} --- 1350,1357 ---- } ! my $class = $data->{'classification'};# FIXME : $class is useless my $dewey = $data->{'dewey'}; $dewey =~ s/0+$//; ! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general books about computer science if ($dewey < 10){$dewey='00'.$dewey;} if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;} *************** *** 1378,1382 **** $sth->finish; #FIXME: ordering/indentation here looks wrong ! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=>"); $sth2->execute($biblionumber); my $data; --- 1377,1381 ---- $sth->finish; #FIXME: ordering/indentation here looks wrong ! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=?"); $sth2->execute($biblionumber); my $data; *************** *** 1949,1953 **** } #print $query; ! my $sth=$dbh->prepare(""); $sth->execute($bornum); my @result; --- 1948,1952 ---- } #print $query; ! my $sth=$dbh->prepare($query); $sth->execute($bornum); my @result; From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.24,1.25 itemtypes.pl,1.11,1.12 koha2marclinks.pl,1.10,1.11 thesaurus.pl,1.10,1.11 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/admin Modified Files: branches.pl itemtypes.pl koha2marclinks.pl thesaurus.pl Log Message: synch'ing 2.0.0 branch and head Index: branches.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/branches.pl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** branches.pl 12 Jan 2004 16:55:05 -0000 1.24 --- branches.pl 11 Feb 2004 08:40:10 -0000 1.25 *************** *** 79,83 **** } $template->param(action => $script_name); - if ($op eq 'add') { # If the user has pressed the "add new branch" button. --- 79,82 ---- Index: itemtypes.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** itemtypes.pl 12 Jan 2004 16:55:05 -0000 1.11 --- itemtypes.pl 11 Feb 2004 08:40:10 -0000 1.12 *************** *** 97,101 **** if ($itemtype) { my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge from itemtypes where itemtype=?"); $sth->execute($itemtype); $data=$sth->fetchrow_hashref; --- 97,101 ---- if ($itemtype) { my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan from itemtypes where itemtype=?"); $sth->execute($itemtype); $data=$sth->fetchrow_hashref; *************** *** 106,110 **** loanlength => $data->{'loanlength'}, renewalsallowed => $data->{'renewalsallowed'}, ! rentalcharge => $data->{'rentalcharge'}); ; # END $OP eq ADD_FORM --- 106,112 ---- loanlength => $data->{'loanlength'}, renewalsallowed => $data->{'renewalsallowed'}, ! rentalcharge => $data->{'rentalcharge'}, ! notforloan => $data->{'notforloan'} ! ); ; # END $OP eq ADD_FORM *************** *** 113,117 **** } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; ! my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge) values ("; $query.= $dbh->quote($input->param('itemtype')).","; $query.= $dbh->quote($input->param('description')).","; --- 115,119 ---- } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; ! my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan) values ("; $query.= $dbh->quote($input->param('itemtype')).","; $query.= $dbh->quote($input->param('description')).","; *************** *** 122,126 **** $query.= "1,"; } ! $query.= $dbh->quote($input->param('rentalcharge')).")"; my $sth=$dbh->prepare($query); $sth->execute; --- 124,133 ---- $query.= "1,"; } ! $query.= $dbh->quote($input->param('rentalcharge')).","; ! if ($input->param('notforloan') ne 1) { ! $query.= "0)"; ! } else { ! $query.= "1)"; ! } my $sth=$dbh->prepare($query); $sth->execute; Index: koha2marclinks.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/koha2marclinks.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** koha2marclinks.pl 12 Jan 2004 16:55:05 -0000 1.10 --- koha2marclinks.pl 11 Feb 2004 08:40:11 -0000 1.11 *************** *** 107,112 **** } #XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS ! my $sth2=$dbh->prepare("SHOW COLUMNS from ?"); ! $sth2->execute($tablename); my $toggle="white"; --- 107,112 ---- } #XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS ! my $sth2=$dbh->prepare("SHOW COLUMNS from $tablename"); ! $sth2->execute; my $toggle="white"; Index: thesaurus.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** thesaurus.pl 22 Dec 2003 19:16:58 -0000 1.10 --- thesaurus.pl 11 Feb 2004 08:40:11 -0000 1.11 *************** *** 258,265 **** father => $father); if ($offset>0) { ! $template->param(previous => "<< Prev"); } if ($pagesize<$count) { ! $template->param(next => "Next >>"); } } #---- END $OP eq DEFAULT --- 258,265 ---- father => $father); if ($offset>0) { ! $template->param(previous => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$prevpage"); } if ($pagesize<$count) { ! $template->param(next => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage"); } } #---- END $OP eq DEFAULT From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/acqui addorder.pl,1.16,1.17 basket.pl,1.16,1.17 newbiblio.pl,1.15,1.16 order.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui Modified Files: addorder.pl basket.pl newbiblio.pl order.pl Log Message: synch'ing 2.0.0 branch and head Index: addorder.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** addorder.pl 4 Sep 2003 17:29:50 -0000 1.16 --- addorder.pl 11 Feb 2004 08:40:11 -0000 1.17 *************** *** 49,53 **** my $title=$input->param('title'); my $author=$input->param('author'); ! my $copyright=$input->param('copyright'); my $isbn=$input->param('ISBN'); my $itemtype=$input->param('format'); --- 49,53 ---- my $title=$input->param('title'); my $author=$input->param('author'); ! my $copyrightdate=$input->param('copyrightdate'); my $isbn=$input->param('ISBN'); my $itemtype=$input->param('format'); *************** *** 72,78 **** my $budget=$input->param('budget'); my $cost=$input->param('cost'); ! my$sub=$input->param('sub'); my $invoice=$input->param('invoice'); ! if ($quantity ne '0'){ #check to see if biblio exists --- 72,78 ---- my $budget=$input->param('budget'); my $cost=$input->param('cost'); ! my $sub=$input->param('sub'); my $invoice=$input->param('invoice'); ! my $publishercode = $input->param('publishercode'); if ($quantity ne '0'){ #check to see if biblio exists *************** *** 81,90 **** $bibnum = &newbiblio({ title => $title?$title:"", author => $author?$author:"", ! copyright => $copyright?$copyright:"", series => $series?$series:"", }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" }); if ($title) { --- 81,91 ---- $bibnum = &newbiblio({ title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyrightdate?$copyrightdate:"", series => $series?$series:"", }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"", ! publishercode => $publishercode?$publishercode:"", }); if ($title) { *************** *** 98,102 **** $bibitemnum= &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" }); } &modbiblio({ --- 99,110 ---- $bibitemnum= &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" , ! publishercode => $publishercode?$publishercode:"", ! }); ! } else { ! &modbibitem({biblioitemnumber => $bibitemnum, ! isbn => $isbn, ! publishercode => $publishercode, ! }); } &modbiblio({ *************** *** 104,109 **** title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyright?$copyright:"", ! series => $series?$series:"" }); } if ($orderexists ne '') { --- 112,118 ---- title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyrightdate?$copyrightdate:"", ! series => $series?$series:"" }, ! ); } if ($orderexists ne '') { Index: basket.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/basket.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** basket.pl 17 Sep 2003 13:33:37 -0000 1.16 --- basket.pl 11 Feb 2004 08:40:11 -0000 1.17 *************** *** 78,81 **** --- 78,82 ---- } $line{ordernumber} = $results[$i]->{'ordernumber'}; + $line{publishercode} = $results[$i]->{'publishercode'}; $line{isbn} = $results[$i]->{'isbn'}; $line{booksellerid} = $results[$i]->{'booksellerid'}; Index: newbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** newbiblio.pl 22 Dec 2003 19:16:59 -0000 1.15 --- newbiblio.pl 11 Feb 2004 08:40:11 -0000 1.16 *************** *** 170,174 **** ecost => $data->{'ecost'}, notes => $data->{'notes'}, ! barcode => $data->{'barcode'},); output_html_with_http_headers $input, $cookie, $template->output; --- 170,175 ---- ecost => $data->{'ecost'}, notes => $data->{'notes'}, ! barcode => $data->{'barcode'}, ! publishercode => $data->{'publishercode'}); output_html_with_http_headers $input, $cookie, $template->output; Index: order.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/order.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** order.pl 8 Jul 2003 16:20:15 -0000 1.9 --- order.pl 11 Feb 2004 08:40:11 -0000 1.10 *************** *** 64,67 **** --- 64,68 ---- $line{id} =$suppliers[$i]->{'id'}; $line{name} = $suppliers[$i]->{'name'}; + $line{active} = $suppliers[$i]->{'active'}; $line{total} = $orders->[0]->{'count(*)'}; $line{authorisedby} = $orders->[0]->{'authorisedby'}; From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/C4 Authorities.pm,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/C4 Modified Files: Authorities.pm Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: Authorities.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Authorities.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Authorities.pm 15 Dec 2003 14:38:59 -0000 1.7 --- Authorities.pm 11 Feb 2004 08:42:02 -0000 1.8 *************** *** 193,199 **** } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " order by category,freelib limit ?,?"; push(@bind,$offset,($pagesize*4)); ! # warn "q : $query"; my $sth=$dbh->prepare($query); $sth->execute(@bind); --- 193,199 ---- } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " limit ?,?"; push(@bind,$offset,($pagesize*4)); ! warn "q : $query". at bind; my $sth=$dbh->prepare($query); $sth->execute(@bind); *************** *** 219,223 **** $cnt = $pagesize+1 if ($cnt>$pagesize); $sth->finish(); ! return ($cnt,\@results); } --- 219,223 ---- $cnt = $pagesize+1 if ($cnt>$pagesize); $sth->finish(); ! return ($#results,\@results); } From tipaul at users.sourceforge.net Wed Feb 11 09:42:05 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:05 -0800 Subject: [Koha-cvs] CVS: koha/misc rebuildthesaurus.pl,1.1,1.2 release_notes_191.txt,1.1,1.2 release_notes_192.txt,1.1,1.2 release_notes_193.txt,1.1,1.2 release_notes_200pre1.txt,1.1,1.2 release_notes_200pre2.txt,1.1,1.2 release_notes_200pre3.txt,1.1,1.2 release_notes_200pre4.txt,1.1,1.2 release_notes_200pre5.txt,1.1,1.2 release_notes_200RC1.txt,1.1,1.2 release_notes_200RC2.txt,1.1,1.2 release_notes_200RC3.txt,1.1,1.2 release_notes_200RC4.txt,1.1,1.2 Install.pm,1.71,1.72 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/misc Modified Files: Install.pm Added Files: rebuildthesaurus.pl release_notes_191.txt release_notes_192.txt release_notes_193.txt release_notes_200pre1.txt release_notes_200pre2.txt release_notes_200pre3.txt release_notes_200pre4.txt release_notes_200pre5.txt release_notes_200RC1.txt release_notes_200RC2.txt release_notes_200RC3.txt release_notes_200RC4.txt Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** Install.pm 9 Feb 2004 22:36:32 -0000 1.71 --- Install.pm 11 Feb 2004 08:42:01 -0000 1.72 *************** *** 378,382 **** =cut ! sub getkohaversion ($) { return($kohaversion); } --- 378,382 ---- =cut ! sub getkohaversion () { return($kohaversion); } *************** *** 990,993 **** --- 990,994 ---- foreach my $mysql (qw(/usr/local/mysql /opt/mysql + /usr/local /usr )) { *************** *** 1149,1152 **** --- 1150,1154 ---- /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf + /etc/apache/httpd.conf /etc/apache-ssl/conf/apache.conf /etc/apache-ssl/httpd.conf From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.66,1.67 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/circ Modified Files: circulation.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** circulation.pl 26 Jan 2004 19:32:36 -0000 1.66 --- circulation.pl 11 Feb 2004 08:42:02 -0000 1.67 *************** *** 410,413 **** --- 410,428 ---- color => $color, ); + if ($flag eq 'GNA'){ + $template->param( + gna => 'true' + ); + } + if ($flag eq 'LOST'){ + $template->param( + lost => 'true' + ); + } + if ($flag eq 'DBARRED'){ + $template->param( + dbarred => 'true' + ); + } if ($flag eq 'CHARGES') { $template->param( From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac-css.fr,1.1,1.2 intranet.en,1.1,1.2 intranet.fr,1.1,1.2 opac.fr,1.4,1.5 tmpl_process.pl,1.9,1.10 translator_doc.txt,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/misc/translator Modified Files: intranet.en intranet.fr opac.fr tmpl_process.pl translator_doc.txt Added Files: opac-css.fr Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: intranet.en =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.en,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.en 9 Dec 2003 10:26:51 -0000 1.1 --- intranet.en 11 Feb 2004 08:42:01 -0000 1.2 *************** *** 1,7 **** ! 0 ***** ! A ***** ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table. ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically. ***** ! A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm. ***** About ***** Abstract ***** --- 1,4 ---- ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically ***** [...1295 lines suppressed...] Yes ***** yes ***** + YES ***** Yes, See below ***** YesNo ***** You ***** ! You are accessing Koha from a different ip address! Please login again ***** You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from! ***** You did not specify any seach criteria ***** ! You entered an incorrect username or password. Please try again ***** You have error(s) in your MARC configuration. Please fix them before using koha ***** You have the following books waiting to be picked up ***** *************** *** 1110,1114 **** You searched on ***** Young Adult Fiction ***** - Z ***** Z39.50 Search ***** Z39.50 Server ***** --- 1082,1085 ---- Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.fr 9 Dec 2003 10:26:51 -0000 1.1 --- intranet.fr 11 Feb 2004 08:42:02 -0000 1.2 *************** *** 1,874 **** ! 0 ***** ! A ***** ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table. ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically. ***** ! A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm. ***** ! About ***** ! Abstract ***** ! Account for ***** ! Account Management Fee ***** ! ACCOUNTING DETAILS ***** [...2154 lines suppressed...] ! You are accessing Koha from a different ip address! Please login again Vous avez changé d'adresse IP. Identifiez-vous à nouveau ! You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from! Vous pouvez nommer ce fichier d'importation. Cela peut servir lors de la création de notice biblio pour se souvenir d'où viennent les données MARC par défaut. ! You did not specify any seach criteria Vous n'avez pas spécifié de critère ! You entered an incorrect username or password. Please try again Identifiant ou mot de passe erroné. Essayez encore ! You have Vous avez ! You have the following books waiting to be picked up Vous avez les livres suivants en attente ! You have the following requests for items on loan Vous avez les demandes suivantes pour des ouvrages en prêt ! You must create a new group for your item to be added to Vous devez créer un nouveau groupe pour ajouter vos ouvrages ! You must give the item a barcode Vous devez attribuer un code barre à l'ouvrage ! You searched for Votre recherche sur ! You Searched for Votre recherche sur ! You searched on Recherche effectuée sur ! Young Adult Fiction Fiction Ados ! Z39.50 Search Recherche Z39.50 ! Z39.50 Server Serveur Z39.50 ! Z39.50 Servers Serveurs Z39.50 ! Z39.50 Servers admin Admin Serveurs Z39.50 ! z3950 search Recherche Z39.50 ! Z3950 Search Results Résultats Recherche Z39.50 ! Zipcode / Town Code postal / Localité Index: opac.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.fr,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac.fr 9 Dec 2003 10:26:51 -0000 1.4 --- opac.fr 11 Feb 2004 08:42:02 -0000 1.5 *************** *** 5,12 **** Advanced Search, More Options Recherche avancée AMOUNT COUT An Error has Occurred Une erreur s'est produite Any Tout Apr Avril - Are any of our records incorrect? Have you moved recently, got a new phone number or e-mail address? Un changement à nous faire connaitre ? ARE OUR RECORDS CORRECT? Est-ce correct Aug Aout --- 5,12 ---- Advanced Search, More Options Recherche avancée AMOUNT COUT + An error has occurred ***** An Error has Occurred Une erreur s'est produite Any Tout Apr Avril ARE OUR RECORDS CORRECT? Est-ce correct Aug Aout *************** *** 15,21 **** BARCODE CODE BARRE Barcode Code barre ! bgcolor='#ffffcc'> ***** Biblio number Notice biblio : - BIBLIO RECORD Notice bibliographique Biblionumber Numéro notice : Cancelled Annul? --- 15,20 ---- BARCODE CODE BARRE Barcode Code barre ! bgcolor="#ffffcc"> ***** Biblio number Notice biblio : Biblionumber Numéro notice : Cancelled Annul? *************** *** 45,58 **** Email Mail End reserve on this date Annuler réservation à cette date - Exact Exact exact exact Feb Fev Fiction Fiction FINES & CHARGES Dettes Firstname Prénom - Free Software ILS SIGB sous licence libre GROUP - GROUPE Group Number Groupe numéro - Hi Bonjour, Home Accueil Home Branch Annexe propriétaire --- 44,55 ---- Email Mail End reserve on this date Annuler réservation à cette date exact exact + Exact Exact Feb Fev Fiction Fiction FINES & CHARGES Dettes Firstname Prénom GROUP - GROUPE Group Number Groupe numéro Home Accueil Home Branch Annexe propriétaire *************** *** 61,73 **** Illus Illus Illustrator Illustrateur ! in dans ! in Maori en langue Maori in the last dans les derniers ISBN ISBN Item Count Nombre d'ouvrages Item lost Ouvrage perdu ! Item Type Type d'ouvrage : ! items currently issued. Ouvrage en prêt actuellement ! items currently reserved. Ouvrages réservés actuellement Itemtype Type d'ouvrage Jan Jan --- 58,69 ---- Illus Illus Illustrator Illustrateur ! in en in the last dans les derniers ISBN ISBN Item Count Nombre d'ouvrages Item lost Ouvrage perdu ! Item Type Type d'ouvrage ! items currently issued Ouvrage en prêt actuellement ! items currently reserved Ouvrages réservés actuellement Itemtype Type d'ouvrage Jan Jan *************** *** 79,96 **** Junior Non-Fiction Junior NF Keywords Mot-clefs - Koha Koha KOHA KOHA - Koha : a gift, a contribution Koha : un don, une contribution Koha Login Identifiant Koha - KOHA: Become a Member KOHA : s'inscrire - KOHA: Catalogue Search Recherche catalogue - Koha: Horowhenua Library Trust Catalogue and Member Services Koha, catalogue et outils abonnés - KOHA: Members Area Zone abonnés KOHA: OPAC Catalogue Search Recherche OPAC Last borrowed Dernier prêt Last Borrower 1 Dernier emprunteur 1 Last Borrower 2 Dernier emprunteur 2 - Last Seen Vu Last seen Vu Library Card Carte lecteur Loan Length Durée prêt --- 75,86 ---- Junior Non-Fiction Junior NF Keywords Mot-clefs KOHA KOHA Koha Login Identifiant Koha KOHA: OPAC Catalogue Search Recherche OPAC Last borrowed Dernier prêt Last Borrower 1 Dernier emprunteur 1 Last Borrower 2 Dernier emprunteur 2 Last seen Vu + Last Seen Vu Library Card Carte lecteur Loan Length Durée prêt *************** *** 100,106 **** Log Out Déconnecter Logged in as Connecté en tant que - Logged in as: [ ***** - login Connecter - Logout Déconnecter Mar Mars May Mai --- 90,93 ---- *************** *** 108,113 **** modify Modifier Month Mois - Next Records Enregistrement suivant - No Non No. of Items N° ouvrage Non-Fiction NF --- 95,98 ---- *************** *** 131,146 **** Paid for Payé pour : Password Mot de passe : ! pick up at Prendre à : Place Placer Place Reserve Réserver Please confirm that you wish to request an item of these types Confirmez que vous souhaitez réserver un ouvrage : Please select the branch from which you want to collect the item Sélectionnez l'annexe ou vous prendrez l'ouvrage ! Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you. Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous. ! Please, change what's needed. An email will be sent to the library. Changer le nécessaire ! Previous Records Précédents Published by Publié par Publisher Editions Recent acquisitions Acquisitions récentes ! records. réponses Reference Books Références Renewals Renouvellements --- 116,131 ---- Paid for Payé pour : Password Mot de passe : ! Pick Up Branch Annexe de retrait Place Placer Place Reserve Réserver + Please change what's needed. An email will be sent to the library Changer le nécessaire Please confirm that you wish to request an item of these types Confirmez que vous souhaitez réserver un ouvrage : Please select the branch from which you want to collect the item Sélectionnez l'annexe ou vous prendrez l'ouvrage ! Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous. Published by Publié par Publisher Editions Recent acquisitions Acquisitions récentes ! record Enr. ! records réponses Reference Books Références Renewals Renouvellements *************** *** 151,173 **** Reserve on this date Réserver à cette date : Reserve page for item Réservation de l'ouvrage : ! reserves already on this item. Réservations déjà faites sur cet ouvrage ! reserves. Réservations Results Résultats ! Results through of records. ***** results found Réponses trouvées ! search IGNORE ! Search IGNORE Search the catalogue Chercher dans le catalogue - Search the Catalogue Chercher dans le catalogue Sep Sep Serial Périodique Size Taille Something new ? quelque chose à modifier ? ! Sorry, KOHA doesnt think you have permission for this page. Désolé, je pense que vous n'avez pas les permissions suffisantes. Sorry, there were no results Désolé, aucun résultat ! ! Sorry, you cannot make more than Impossible de faire plus de ! Sorry, you cannot make more than reserves. Désolé, vous ne pouvez pas faire plus de réservations ! Sorry, you cannot make reserves because you owe . Désolé, vous ne pouvez pas faire de réservation parce que vous devez ! Sorry, your session has timed out, please login again. Déconnecté. Identifiez vous à nouveau. STILL OWING EN ATTENTE Street address Adresse postale --- 136,155 ---- Reserve on this date Réserver à cette date : Reserve page for item Réservation de l'ouvrage : ! reserves already on this item Réservations déjà faites sur cet ouvrage Results Résultats ! Results through of records ***** results found Réponses trouvées ! Search LIMITED;Chercher ! search LIMITED;recherche Search the catalogue Chercher dans le catalogue Sep Sep Serial Périodique Size Taille Something new ? quelque chose à modifier ? ! Sorry, KOHA doesnt think you have permission for this page Désolé, je pense que vous n'avez pas les permissions suffisantes. Sorry, there were no results Désolé, aucun résultat ! ! Sorry, you cannot make more than reserves Désolé, vous ne pouvez pas faire plus de réservations ! Sorry, you cannot make reserves because you owe Désolé, vous ne pouvez pas faire de réservation parce que vous devez ! Sorry, your session has timed out, please login again Déconnecté. Identifiez vous à nouveau STILL OWING EN ATTENTE Street address Adresse postale *************** *** 177,181 **** Surname Nom Teacher Reference Ref. prof. ! text/html; charset=iso8859-1 text/html; charset=iso8859-1 There are Il y a through à --- 159,163 ---- Surname Nom Teacher Reference Ref. prof. ! text/html; charset=iso-8859-1 text/html; charset=iso8859-1 There are Il y a through à *************** *** 184,189 **** Total Due Total dû Total Number of Items Nombre total d'exemplaires ! Try another Essayez un autre ! Type in the box and press the enter key. Saisissez et validez avec Entrée Unititle Titre unifié Update Record Mettre à jour --- 166,171 ---- Total Due Total dû Total Number of Items Nombre total d'exemplaires ! Try another Essayez une autre ! Type in the box and press the enter key Saisissez et validez avec Entrée Unititle Titre unifié Update Record Mettre à jour *************** *** 196,216 **** Work/Fax phone Tel bureau Year Année - Year : Année : - Yes Oui YesNo OuiNon ! You already have a reserve placed on this item. Vous avez déjà placé une réservation sur cet exemplaire ! You are accessing koha from a different ip address! please login again. Vous avez changé d'adresse IP. Identifiez vous à nouveau ! You did not specify any seach criteria Vous n'avez pas spécifié de critère ! You entered an incorrect username or password, please try again. Identifiant ou mot de passe erroné. Essayez encore. ! You have Vous avez ! You have items currently issued. Vous avez exemplaires en prêt ! You have items currently reserved. Vous avez exemplaires réservés You have a credit of Vous avez un crédit de ! You have no items on issue. Vous n'avez pas d'exemplaire en prêt You have outstanding charges and fines of Vous avez des dettes de You have reserved items waiting Vous avez des réservations en attente You must select a branch for pickup! Sélectionnez une annexe ou retirer l'ouvrage ! You must select at least on item type! Vous devez sélectionner au moins 1 type d'exemplaire You searched on Recherche effectuée sur Young Adult Fiction Ado fiction ! Your changes won't appear until the library has validated them. Vos changement n'apparaitront que lorsque la bibliothèque les aura validé --- 178,195 ---- Work/Fax phone Tel bureau Year Année YesNo OuiNon ! You already have a reserve placed on this item Vous avez déjà placé une réservation sur cet exemplaire ! You are accessing koha from a different ip address! please login again Vous avez changé d'adresse IP. Identifiez vous à nouveau ! You did not specify any search criteria Vous n'avez pas spécifié de critère ! You entered an incorrect username or password, please try again Identifiant ou mot de passe erroné. Essayez encore. ! You have items currently issued Vous avez exemplaires en prêt ! You have items currently reserved Vous avez exemplaires réservés You have a credit of Vous avez un crédit de ! You have no items on issue Vous n'avez pas d'exemplaire en prêt You have outstanding charges and fines of Vous avez des dettes de You have reserved items waiting Vous avez des réservations en attente You must select a branch for pickup! Sélectionnez une annexe ou retirer l'ouvrage ! You must select at least one item type! Vous devez sélectionner au moins 1 type d'exemplaire You searched on Recherche effectuée sur Young Adult Fiction Ado fiction ! Your changes won't appear until the library has validated them Vos changement n'apparaitront que lorsque la bibliothèque les aura validé Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** tmpl_process.pl 10 Feb 2004 09:42:18 -0000 1.9 --- tmpl_process.pl 11 Feb 2004 08:42:02 -0000 1.10 *************** *** 74,78 **** { # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char); # updates the list, adding new entries if any %strhash = &update_strhash(\%strhash, \@in_files, $exclude_regex, $filter); --- 74,78 ---- { # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char,1); # updates the list, adding new entries if any %strhash = &update_strhash(\%strhash, \@in_files, $exclude_regex, $filter); *************** *** 94,98 **** # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char); # creates the new tmpl file using the new translation &install_strhash(\%strhash, \@in_files, $in_dir, $out_dir); --- 94,98 ---- # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char,0); # creates the new tmpl file using the new translation &install_strhash(\%strhash, \@in_files, $in_dir, $out_dir); *************** *** 116,121 **** my $tmp_dir; # temporary directory name (used to create destination dir) ! $out_dir =~ s/\/$//; # chops the trailing / if any. # Processes every entry found. foreach my $file (@{$in_files}) --- 116,122 ---- my $tmp_dir; # temporary directory name (used to create destination dir) ! my $starttime = time(); + $out_dir =~ s/\/$//; # chops the trailing / if any. # Processes every entry found. foreach my $file (@{$in_files}) *************** *** 129,132 **** --- 130,134 ---- # generates the name of the output file my $out_file = $file; + my $out_file_tmp = $file.".tmp"; # used to check if file has changed or not. if(!defined $in_dir) *************** *** 159,198 **** exit(1); } ! # opens handle for output ! if( !open($fh_out, "> $out_file") ) { ! warn "Can't write $out_file : $!\n"; close($fh_in); next; } ! ! print "Generating $out_file...\n"; ! while(my $line = <$fh_in>) { ! foreach my $text (sort {length($b) <=> length($a)} keys %{$strhash}) { ! # Test if the key has been translated ! if( %{$strhash}->{$text} != 1 ) { ! # Does the line contains text that needs to be changed ? ! if( $line =~ /$text/ && %{$strhash}->{$text} ne "IGNORE") { # changing text ! my $subst = %{$strhash}->{$text}; ! $line =~ s/(\W)$text(\W)/$1$subst$2/g; } } } - $line =~ s/\/\<\!-- TMPL_$1 --\>/g; - $line =~ s/\<\/TMPL_(.*?)\>/\<\!-- \/TMPL_$1 --\>/g; - # Writing the modified (or not) line to output - printf($fh_out "%s", $line); } ! close($fh_in); close($fh_out); } } --- 161,243 ---- exit(1); } ! # opens handle for output ! if( !open($fh_out, "> $out_file_tmp") ) { ! warn "Can''t write $out_file : $!\n"; close($fh_in); next; } ! my $lines; while(my $line = <$fh_in>) { ! $lines.=$line; ! } ! foreach my $text (sort {length($b) <=> length($a) || uc($b) cmp uc($a) } keys %{$strhash}) ! { ! # Test if the key has been translated ! if( %{$strhash}->{$text} != 1) { ! # Does the file contains text that needs to be changed ? ! # escaping \|()[{}^$*+?. ! my $subst = %{$strhash}->{$text}; ! $text =~ s/\\/\\\\/g; ! $text =~ s/\//\\\//g; ! $text =~ s/\|/\\\|/g; ! $text =~ s/\(/\\\(/g; ! $text =~ s/\)/\\\)/g; ! $text =~ s/\[/\\\[/g; ! $text =~ s/\]/\\\]/g; ! $text =~ s/\{/\\\{/g; ! $text =~ s/\}/\\\}/g; ! $text =~ s/\^/\\\^/g; ! $text =~ s/\$/\\\$/g; ! $text =~ s/\*/\\\*/g; ! $text =~ s/\+/\\\+/g; ! $text =~ s/\?/\\\?/g; ! $text =~ s/\./\\\./g; ! if(%{$strhash}->{$text} ne "IGNORE" ) { ! if (%{$strhash}->{$text} =~ "LIMITED") { # changing text ! $subst =~ s/UNUSED;//; ! $subst =~ s/^LIMITED;//g; ! $lines =~ s/(.*)>$text(\W)/$1>$subst$2/g; ! $lines =~ s/(.*) title="$text/$1 title="$subst/g; ! $lines =~ s/(.*) alt="$text/$1 alt="$subst/g; ! } else { ! # changing text ! $subst =~ s/UNUSED;//; ! $lines =~ s/(\W)$text(\W)/$1$subst$2/g; } } } } ! $lines =~ s/\/\<\!-- TMPL_$1 --\>/g; ! $lines =~ s/\<\/TMPL_(.*?)\>/\<\!-- \/TMPL_$1 --\>/g; ! # Writing the modified (or not) file to output ! printf($fh_out "%s", $lines); close($fh_in); close($fh_out); + # check if fh_out and previous fh_out has changed or not. + my $diff; + if(-f $out_file) { + $diff = `diff $out_file $out_file_tmp`; + } else { + $diff = "write it, it's new"; + } + if ($diff) { + print "WRITING : $out_file\n"; + unlink $out_file; + system("mv $out_file_tmp $out_file"); + } else { + print "no changes in $out_file\n"; + unlink $out_file_tmp; + } } + my $timeneeded = time() - $starttime; + print "done in $timeneeded seconds\n"; + } *************** *** 213,217 **** print "Processing $in...\n"; ! # Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; --- 258,262 ---- print "Processing $in...\n"; ! # 'Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; *************** *** 222,227 **** { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^\s+//; # remove trailing blanks, ':' or '*' ! $str =~ s/\s*\**:*\s*$//; # the line begins with letter(s) followed by optional words and/or spaces --- 267,272 ---- { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^[\s+:\(]*//; # remove useless characters ! $str =~ s/[\s\*:\[*\(|\.,\)]*$//; # the line begins with letter(s) followed by optional words and/or spaces *************** *** 235,238 **** --- 280,286 ---- # the line is not already in the list so add it %{$strhash}->{$str}=1; + } else { + # remove UNUSED; + %{$strhash}->{$str} =~ s/^UNUSED;//; } } *************** *** 252,257 **** sub restore_strhash { ! my($strhash, $str_file, $split_char) = @_; ! my $fh; --- 300,305 ---- sub restore_strhash { ! my($strhash, $str_file, $split_char, $detect_unused) = @_; ! my $fh; *************** *** 259,263 **** print "Restoring string list from $str_file...\n"; ! while( my $line = <$fh> ) { --- 307,311 ---- print "Restoring string list from $str_file...\n"; ! while( my $line = <$fh> ) { *************** *** 277,280 **** --- 325,331 ---- %{$strhash}->{$original} = 1; } + if ($detect_unused) { + %{$strhash}->{$original} = "UNUSED;".%{$strhash}->{$original} unless %{$strhash}->{$original}=~ /^UNUSED;/; + } } *************** *** 300,306 **** print "Writing string list to $str_file...\n"; ! foreach my $str(sort {uc($a) cmp uc($b) || length($a) <=> length($b)} keys %{$strhash}) { ! if(%{$strhash}->{$str} != 1) { printf($fh "%s%s%s\n", $str, $split_char, %{$strhash}->{$str}); --- 351,357 ---- print "Writing string list to $str_file...\n"; ! foreach my $str(sort {uc($a) cmp uc($b) || length($b) <=> length($a)} keys %{$strhash}) { ! if(%{$strhash}->{$str}!=1) { printf($fh "%s%s%s\n", $str, $split_char, %{$strhash}->{$str}); *************** *** 308,312 **** else { ! printf($fh "%s%s%s\n", $str, $split_char,"*****") unless ($str >0); } } --- 359,363 ---- else { ! printf($fh "%s%s%s\n", $str, $split_char,"*****") unless ($str >0 || length($str) eq 1); } } *************** *** 457,458 **** --- 508,510 ---- exit(0); } + Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** translator_doc.txt 5 Dec 2003 16:53:46 -0000 1.1 --- translator_doc.txt 11 Feb 2004 08:42:02 -0000 1.2 *************** *** 1,3 **** ! TRANSLATION TOOL : ============ This transation tool should greatly help Koha translators. --- 1,3 ---- ! TRANSLATION TOOL , V2.0: ============ This transation tool should greatly help Koha translators. *************** *** 15,25 **** ============ 1- create your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & french being separated by a tab 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version, go back to pt1 & repeat. WEAKNESSES --- 15,31 ---- ============ 1- create your translation file : ! ./tmpl_process.pl create -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images/css files in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version : ! 1- update your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate new your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) ! 3- create your translated version : ! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy new images/css files in your new directory if needed WEAKNESSES *************** *** 39,44 **** words that are in the templates and in a perl script name are replaced ! For example : Search is replace by Recherche in french, thus,giving , which is wrong... ! The only way I've found to solve this is to ignore any translation whose translation string is IGNORE ! (search is the only cas i've found in french opac) - MISSING STRINGS --- 45,61 ---- words that are in the templates and in a perl script name are replaced ! For example : Search is replace by Recherche in french, thus,giving , which is wrong... ! 2 ways to solve this problem, IGNORE & LIMITED pragma. ! IGNORE : ! if a line in translation file is : ! this_original_string IGNORE ! it is ignored during translation. ! LIMITED : ! if a line in translation file is : ! this_original_string LIMITED;the_translation_string ! The string is translated only if : ! * has a > just before ! * has title=" just before ! * has alt=" just before. ! This prevent stupid replaces, at the cost of some missing translation maybe. - MISSING STRINGS From tipaul at users.sourceforge.net Wed Feb 11 09:46:07 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:46:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-main.tmpl,1.2,1.3 opac-user.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24748/koha-tmpl/opac-tmpl/vanilla/en Modified Files: opac-main.tmpl opac-user.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 18 Mar 2003 19:52:36 -0000 1.2 --- opac-main.tmpl 11 Feb 2004 08:46:05 -0000 1.3 *************** *** 162,166 ****

    For more information on the koha libary system
    ! vist     www.koha.org

    \ No newline at end of file --- 162,166 ----

    For more information on the koha libary system
    ! visit www.koha.org

    \ No newline at end of file Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-user.tmpl 18 Mar 2003 19:52:37 -0000 1.2 --- opac-user.tmpl 11 Feb 2004 08:46:05 -0000 1.3 *************** *** 139,144 **** ! Renew Not renewable --- 139,148 ---- ! ! ! Not renewable ! Renew + Not renewable *************** *** 227,231 **** ! Renew --- 231,235 ---- ! Renew From tipaul at users.sourceforge.net Wed Feb 11 09:44:31 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:31 -0800 Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_210c.pl,1.3,1.4 unimarc_field_225a.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/value_builder Modified Files: unimarc_field_210c.pl unimarc_field_225a.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: unimarc_field_210c.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_210c.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** unimarc_field_210c.pl 1 Aug 2003 14:20:51 -0000 1.3 --- unimarc_field_210c.pl 11 Feb 2004 08:44:28 -0000 1.4 *************** *** 78,82 **** $res .= " ]; ! // search isbn subfield. it's 010a var isbn_found; for (i=0 ; iparam("result"); ! print "Content-Type: text/html\n\n"; exit; } --- 115,122 ---- my ($input) = @_; my $index = $input->param("index"); ! my $result = $input->param("result"); ! $result=~s/ / /g; ! $result=~s/"/"/g; ! print "Content-Type: text/html\n\n"; exit; } Index: unimarc_field_225a.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** unimarc_field_225a.pl 23 Jun 2003 11:27:49 -0000 1.5 --- unimarc_field_225a.pl 11 Feb 2004 08:44:29 -0000 1.6 *************** *** 120,124 **** my @collections; if ($isbn_found) { ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS'"); my @splited = split //, $isbn_found; my $isbn_rebuild=''; --- 120,124 ---- my @collections; if ($isbn_found) { ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS' order by stdlib"); my @splited = split //, $isbn_found; my $isbn_rebuild=''; *************** *** 132,136 **** } else { # if there is no isbn, search with % ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS'"); $sth->execute("\%$authoritysep $editor_found $authoritysep"); while (my ($line)= $sth->fetchrow) { --- 132,136 ---- } else { # if there is no isbn, search with % ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib"); $sth->execute("\%$authoritysep $editor_found $authoritysep"); while (my ($line)= $sth->fetchrow) { From tipaul at users.sourceforge.net Wed Feb 11 09:44:30 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:30 -0800 Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.10,1.11 search.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/z3950 Modified Files: processz3950queue search.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: processz3950queue =================================================================== RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** processz3950queue 6 Nov 2003 15:08:40 -0000 1.10 --- processz3950queue 11 Feb 2004 08:44:28 -0000 1.11 *************** *** 11,14 **** --- 11,91 ---- use Net::Z3950; + =head1 NAME + + processz3950queue. The script that does z3950 searches. + + =head1 SYNOPSIS + + This script can be used on a console (as normal user) or by the daemon-launch script. + + Don't forget to EXPORT PERL5LIB=/PATH/to/KOHA before executing it if you use console mode. + + It : + 1- extracts z3950 requests from z3950queue table, + 2- creates entries in z3950results to store the result + 3- launch z3950 queries in asynchronous mode, using Unix fork() + 4- store results in marc_breeding table. + + The z3950 results queries are managed in z3950/search.pl script (poped-up window in MARC editor). + + =head1 DESCRIPTION + + =head2 table z3950servers + + This table stores the differents z3950 servers. + A server is used if checked=1. The rank is NOT used as searches are now asynchronous. + + =head2 table z3950queue + + Table use to manage queries. A single line is created in this table for each z3950 search request. + If more than 1 server is called, the C field containt all of them separated by |. + + z3950 search requests are done by z3950/search.pl script. + At this stage, the fields are created with C and C empty + + Then, the processz3950queue finds this entry and : + 1- store date (time()) in C + 2- set C = -1 + + when the requests are all sent : + 2- set C = 1 + 3- set C (FIXME: always equal to startdate for me) + + entries are deleted when : + - C is more than 1 day ago. + + FIXME: + - results, numrecords fields are unused + + =head2 table z3950results + + 1 entry is created for each request, for each server called. + when created : + * C is filled + * C is null + * active is set to 0. when active is 0, it means the request has not been sent. when set to 1, it means it's on the way. + + When a search is ended, C is set, and C is set to -1 + + =head1 How it's written + + on every loop : + * delete old queries + * for each entry in z3950queue table that is not done=1 { + for each search request { + for each server { + try to connect + look for results + * results can be : + - existing and already running on another process (active=1) + - existing & finished (active=-1) + - non existent => create it and run the request. + } + } + } + =over 2 + + =cut + if ($< == 0) { *************** *** 30,34 **** my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("update z3950results set active=0"); $sth->execute; $sth->finish; --- 107,112 ---- my $dbh = C4::Context->dbh; ! # we begin the script, so "unactive" every pending request : they will never give anything, the script died :-( ! my $sth=$dbh->prepare("update z3950results set active=0 where active<>-1"); $sth->execute; $sth->finish; *************** *** 52,106 **** print "starting loop\n"; $checkqueue = 1; # FIXME during testing, this line forces the loop. REMOVE it to use SIG{HUP} when "daemonized" ! if ($checkqueue) { # everytime a SIG{HUP} is recieved $checkqueue=0; ! my $sth=$dbh->prepare("select id,term,type,servers,identifier from z3950queue order by id"); $sth->execute; while (my ($id, $term, $type, $servers,$random) = $sth->fetchrow) { if ($forkcounter<12) { my $now=time(); my $stk=$dbh->prepare("select id,server,startdate,enddate,numrecords,active from z3950results where queryid=?"); ($stk->execute($id)) || (next); my %serverdone; unless ($stk->rows) { my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=? where id=?"); $sti->execute($now,$id); } while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) { ! if ($r_enddate >0) { $serverdone{$r_server}=1; ! } elsif ($active) { $serverdone{$r_server}=1; ! } else { $serverdone{$r_server}=-1; } } - $stk->finish; ! my $attr=''; ! if ($type eq 'isbn') { ! $attr='1=7'; ! } elsif ($type eq 'title') { ! $attr='1=4'; ! } elsif ($type eq 'author') { ! $attr='1=1003'; ! } elsif ($type eq 'lccn') { ! $attr='1=9'; ! } elsif ($type eq 'keyword') { ! $attr='1=1016'; ! } ! $term='"'.$term.'"'; ! my $query="\@attr $attr $term"; ! my $totalrecords=0; ! my $serverinfo; ! my $stillprocessing=0; ! my $globalname; ! my $globalsyntax; ! my $globalencoding; ! foreach $serverinfo (split(/\|/, $servers)) { ! (next) if ($serverdone{$serverinfo} == 1); ! my $stillprocessing=1; if (my $pid=fork()) { $forkcounter++; } else { my $dbi = C4::Context->dbh; my ($name, $server, $database, $user, $password,$syntax) = split(/\//, $serverinfo, 6); --- 130,183 ---- print "starting loop\n"; $checkqueue = 1; # FIXME during testing, this line forces the loop. REMOVE it to use SIG{HUP} when "daemonized" ! + # clean DB + my $now = time(); + # delete z3950queue entries that are more than 1 day old + my $sth = $dbh->prepare("delete from z3950queue where ?-startdate > 86400"); + $sth->execute($now); + # delete z3950results queries that are more than 1 hour old + $sth = $dbh->prepare("delete from z3950results where ?-startdate > 3600"); + $sth->execute($now); if ($checkqueue) { # everytime a SIG{HUP} is recieved $checkqueue=0; ! # parse every entry in QUEUE ! $sth=$dbh->prepare("select id,term,type,servers,identifier from z3950queue where done<>1 or done is null order by id"); $sth->execute; while (my ($id, $term, $type, $servers,$random) = $sth->fetchrow) { + # FIXME: there is no "else". So, if more than 12 requests at the same time => requests are lost ! if ($forkcounter<12) { my $now=time(); + # search for results entries for this request my $stk=$dbh->prepare("select id,server,startdate,enddate,numrecords,active from z3950results where queryid=?"); ($stk->execute($id)) || (next); my %serverdone; + # if no results => set queue to done = -1, set startdate and begin creating z3950results table entries & z3950 queries unless ($stk->rows) { my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=? where id=?"); $sti->execute($now,$id); } + # check which servers calls have already been created (before a crash) while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) { ! if ($r_enddate >0) { # result entry exist & finished $serverdone{$r_server}=1; ! } elsif ($active) { # result entry exists & on the way (active=1) or already done (active=-1) $serverdone{$r_server}=1; ! } else { # otherwise $serverdone{$r_server}=-1; } + # note that is the entry doesn't exist, the $serverdone{$r_server} is 0 (important later !) } $stk->finish; ! foreach my $serverinfo (split(/\|/, $servers)) { ! (next) if ($serverdone{$serverinfo} == 1); #(otherwise, is 0 or -1) ! my $totalrecords=0; ! my $globalname; ! my $globalsyntax; ! my $globalencoding; ! # fork a process for this z3950 query if (my $pid=fork()) { $forkcounter++; } else { + # and connect to z3950 server + #FIXME: why do we need $dbi ? can't we use $dbh ? my $dbi = C4::Context->dbh; my ($name, $server, $database, $user, $password,$syntax) = split(/\//, $serverinfo, 6); *************** *** 110,172 **** my $servername=$1; my $port=$2; ! print "Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n"; ! $now=time(); ! my $q_serverinfo=$dbi->quote($serverinfo); ! my $resultsid; ! if ($serverdone{$serverinfo}==-1) { ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($q_serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! } else { ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($q_serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! unless ($resultsid) { ! $stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)"); ! $stj->execute($q_serverinfo, $id, $now); ! $resultsid=$dbi->{'mysql_insertid'}; ! $stj->finish; ! } } ! my $stj=$dbh->prepare("update z3950results set active=1 where id=?"); ! $stj->execute($resultsid); my $conn; my $noconnection=0; my $error=0; if ($user) { ! eval { $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database, user => $user, password => $password); }; ! if ($@) { ! $noconnection=1; ! } else { ! $error=pe(); ! } } else { ! eval { $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database); }; ! if ($@) { ! $noconnection=1; ! } else { ! $error=pe(); ! } } if ($noconnection || $error) { ! warn "no connection at $globalname "; } else { ! warn "$globalname ==> $globalsyntax"; eval {$conn->option(elementSetName => 'F')}; eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC"); eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC"); if ($@) { ! print "$globalname ERROR: $@\n"; } else { - # print "Q: $query\n"; my $rs=$conn->search($query); pe(); my $numresults=$rs->size(); if ($numresults eq 0) { ! warn "$globalname ==> answered : no records found"; } else { ! warn "$globalname ==> answered : $numresults found"; } pe(); --- 187,267 ---- my $servername=$1; my $port=$2; ! my $attr=''; ! if ($type eq 'isbn') { ! $attr='1=7'; ! } elsif ($type eq 'title') { ! $attr='1=4'; ! } elsif ($type eq 'author') { ! $attr='1=1003'; ! } elsif ($type eq 'lccn') { ! $attr='1=9'; ! } elsif ($type eq 'keyword') { ! $attr='1=1016'; } ! my $query="\@attr $attr \"$term\""; ! print "$$/$id : Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n"; ! # try to connect my $conn; my $noconnection=0; my $error=0; + # the z3950 query is builded. Launch it. if ($user) { ! $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database, user => $user, password => $password) || ($noconnection=1); } else { ! $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database) || ($noconnection=1); } if ($noconnection || $error) { ! # if connection impossible, don't go further ! ! print "$$/$id : no connection at $globalname\n"; ! my $result = MARC::Record->new(); ! my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($result,-1,"$globalname server is NOT responding","",$random); } else { ! # else, build z3950 query and do it ! ! $now=time(); ! my $resultsid=""; ! # create z3950results entries. ! if ($serverdone{$serverinfo}==-1) { # if entry exist, just retrieve it ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! print "$$/$id : 1 >> $resultsid\n"; ! } else { # else create it : (may be serverdone=1 or 0) ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! print "$$/$id : 2 >> $resultsid\n"; ! unless ($resultsid) { ! $stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)"); ! $stj->execute($serverinfo, $id, $now); ! $resultsid=$dbi->{'mysql_insertid'}; ! $stj->finish; ! print "$$/$id : creating and "; ! } ! } ! print "$$/$id : working on results entry $resultsid\n"; ! # set active to 1 => this request is on the way. ! my $stj=$dbi->prepare("update z3950results set active=1 where id=?"); ! $stj->execute($resultsid); ! ####### ! print "$$/$id : connected to $globalname\n"; eval {$conn->option(elementSetName => 'F')}; eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC"); eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC"); if ($@) { ! print "$$/$id : $globalname ERROR: $@ for $resultsid\n"; ! # in case pb during connexion, set result to "empty" to avoid everlasting loops ! my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results='',enddate=? where id=?"); ! $stj->execute(0,0,$now,$resultsid); } else { my $rs=$conn->search($query); pe(); + # we have an answer for a query => get results & store them in marc_breeding table my $numresults=$rs->size(); if ($numresults eq 0) { ! print "$$/$id : $globalname : no records found\n"; } else { ! print "$$/$id : $globalname : $numresults records found, retrieving them (max 80)\n"; } pe(); *************** *** 198,202 **** if ($elapsed) { my $speed=int($numresults/$elapsed*100)/100; ! print "$globalname SPEED: $speed $server done $numrecords\n"; } my $q_result=$dbi->quote($result); --- 293,297 ---- if ($elapsed) { my $speed=int($numresults/$elapsed*100)/100; ! print "$$/$id : $globalname : $server records retrieved $numrecords SPEED: $speed\n"; } my $q_result=$dbi->quote($result); *************** *** 210,274 **** $stj->execute($numresults,$numrecords,$now,$resultsid); } - my $counter=0; - while ($counter<60 && $numrecords<$numresults) { - $counter++; - my $stj=$dbi->prepare("select highestseen from z3950results where id=?"); - $stj->execute($resultsid); - my ($highestseen) = $stj->fetchrow; - if ($highestseen>($numrecords-30)) { - $counter=0; - print " $server rescanning\n"; - my $scantimerstart=time(); - for ($i=$numrecords+1; $i<=(($numresults<($numrecords+40)) ? ($numresults) : ($numrecords+40)); $i++) { - my $rec=$rs->record($i); - my $marcdata=$rec->rawdata(); - $result.=$marcdata; - } - my $scantimerend=time(); - ($numresults<$numrecords+40) ? ($numrecords=$numresults) : ($numrecords += 40); - my $elapsed=$scantimerend-$scantimerstart; - if ($elapsed) { - my $speed=int($numresults/$elapsed*100)/100; - print " SPEED: $speed $server done $numrecords\n"; - } - - my $q_result=$dbi->quote($result); - ($q_result) || ($q_result='""'); - $now=time(); - my $stj=$dbi->prepare("update z3950results set numdownloaded=?,results=? where id=?"); - $stj->execute($numrecords,$q_result,$resultsid); - } - sleep 5; - } } } ! # FIXME - There's already a $stj in this scope ! my $stj=$dbi->prepare("update z3950results set active=0 where id=?"); ! $stj->execute($resultsid); ! eval {$stj->finish}; ! print " $server done.\n"; exit; - sub pe { - return 0; - my $code=$conn->errcode(); - my $msg=$conn->errmsg(); - my $ai=$conn->addinfo(); - print << "EOF"; - CODE: $code - MSG: $msg - ADDTL: $ai - EOF - return 0; - } } } - unless ($stillprocessing) { - #my $sti=$dbh->prepare("select enddate from z3950queue where id=?"); - #$sti->execute($id); - #my ($enddate) = $sti->fetchrow; - #unless ($enddate) { - } } else { } } $lastrun=time(); --- 305,325 ---- $stj->execute($numresults,$numrecords,$now,$resultsid); } } + $stj=$dbi->prepare("update z3950results set active=-1 where id=?"); + $stj->execute($resultsid); + eval {my $stj->finish}; } ! #OK, the search is done inactivate it.. ! print "$$/$id : $server search done.\n"; exit; } } } else { + # $forkcounter >=12 } + # delete z3950queue entry, as everything is done + my $sti=$dbh->prepare("update z3950queue set done=1,enddate=? where id=?"); + $now=time(); + $sti->execute($now,$id); } $lastrun=time(); *************** *** 289,290 **** --- 340,344 ---- + sub pe { + return 0; + } Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/z3950/search.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** search.pl 23 Jun 2003 11:28:53 -0000 1.2 --- search.pl 11 Feb 2004 08:44:28 -0000 1.3 *************** *** 50,54 **** my $record; my $oldbiblio; - warn "search.pl : $bibid / $title / $author / $isbn"; if ($bibid > 0) { $record = MARCgetbiblio($dbh,$bibid); --- 50,53 ---- *************** *** 57,71 **** my $errmsg; unless ($random) { # if random is a parameter => we're just waiting for the search to end, it's a refresh. - warn "NO RANDOM"; if ($isbn) { - warn "ADD ISBN $isbn"; $random =rand(1000000000); $errmsg = addz3950queue($isbn, "isbn", $random, 'CHECKED'); } elsif ($author) { - warn "ADD AUTHOR $author"; $random =rand(1000000000); $errmsg = addz3950queue($author, "author", $random, 'CHECKED'); } elsif ($title) { - warn "ADD TITLE : $title"; $random =rand(1000000000); $errmsg = addz3950queue($title, "title", $random, 'CHECKED'); --- 56,66 ---- From tipaul at users.sourceforge.net Wed Feb 11 09:44:32 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:32 -0800 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.71,1.72 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/updater Modified Files: updatedatabase Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** updatedatabase 18 Dec 2003 17:23:22 -0000 1.71 --- updatedatabase 11 Feb 2004 08:44:29 -0000 1.72 *************** *** 857,860 **** --- 857,875 ---- $dbh->do('create fulltext index category_2 on bibliothesaurus (category,freelib)') unless $exists; + # + # creating index in z3950results if needed + # + $sth = $dbh->prepare("show index from z3950results"); + $sth->execute; + my $exists=0; + while ( my ( $table, $non_unique, $key_name, $Seq_in_index, $Column_name, $Collation, $cardinality, $sub_part, $Packed, $comment ) = $sth->fetchrow ) + { + if ($key_name eq 'query_server') { + $exists=1; + } + } + print "Creating index on z3950results\n" unless $exists; + $dbh->do('create unique index query_server on z3950results (queryid,server)') unless $exists; + # changing z3950daemon field to NULL in marc_breeding $dbh->do("ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"); *************** *** 982,986 **** # $Log$ ! # Revision 1.71 2003/12/18 17:23:22 tipaul # fix for 625 # --- 997,1007 ---- # $Log$ ! # Revision 1.72 2004/02/11 08:44:29 tipaul ! # synch'ing 2.0.0 branch (RC4 tag) and head ! # ! # Revision 1.70.2.2 2004/01/20 09:46:53 tipaul ! # new index in z3950results table ! # ! # Revision 1.70.2.1 2003/12/18 17:22:24 tipaul # fix for 625 # From tipaul at users.sourceforge.net Wed Feb 11 09:44:32 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:32 -0800 Subject: [Koha-cvs] CVS: koha/sec writeoff.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/sec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/sec Modified Files: writeoff.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: writeoff.pl =================================================================== RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** writeoff.pl 13 Oct 2002 10:46:38 -0000 1.6 --- writeoff.pl 11 Feb 2004 08:44:30 -0000 1.7 *************** *** 69,92 **** my $dbh = C4::Context->dbh; my $env; ! my $query="Update accountlines set amountoutstanding=0 where "; if ($accounttype eq 'Res'){ ! $query.="accounttype='Res' and accountno='$accountnum' and borrowernumber='$bornum'"; } else { ! $query.="accounttype='$accounttype' and itemnumber='$itemnum' and borrowernumber='$bornum'"; } - my $sth=$dbh->prepare($query); - # print $query; - $sth->execute; $sth->finish; ! $query="select max(accountno) from accountlines"; ! $sth=$dbh->prepare($query); $sth->execute; my $account=$sth->fetchrow_hashref; $sth->finish; $account->{'max(accountno)'}++; ! $query="insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype) ! values ('$bornum','$account->{'max(accountno)'}','$itemnum',now(),'$amount','Writeoff','W')"; ! $sth=$dbh->prepare($query); ! $sth->execute; $sth->finish; # print $query; --- 69,89 ---- my $dbh = C4::Context->dbh; my $env; ! my $sth; if ($accounttype eq 'Res'){ ! $sth=$dbh->prepare("Update accountlines set amountoutstanding=0 where accounttype='Res' and accountno=? and borrowernumber=?"); ! $sth->execute($accountnum,$bornum); } else { ! $sth=$dbh->prepare("Update accountlines set amountoutstanding=0 where accounttype=? and itemnumber=? and borrowernumber=?"); ! $sth->execute($accounttype,$itemnum,$bornum); } $sth->finish; ! $sth=$dbh->prepare("select max(accountno) from accountlines"); $sth->execute; my $account=$sth->fetchrow_hashref; $sth->finish; $account->{'max(accountno)'}++; ! $sth=$dbh->prepare("insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype) ! values (?,?,?,now(),?,'Writeoff','W')"); ! $sth->execute($bornum,$account->{'max(accountno)'},$itemnum,$amount); $sth->finish; # print $query; From tipaul at users.sourceforge.net Wed Feb 11 09:57:23 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:57:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.14,1.15 opac-main.tmpl,1.14,1.15 opac-searchresults.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26686/koha-tmpl/opac-tmpl/default/en Modified Files: opac-detail.tmpl opac-main.tmpl opac-searchresults.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** opac-detail.tmpl 7 Jan 2004 17:26:13 -0000 1.14 --- opac-detail.tmpl 11 Feb 2004 08:57:16 -0000 1.15 *************** *** 8,17 ****

    ! ! --- 8,17 ----

    !

    !

    ! (record )
    *************** *** 19,38 **** --- 19,41 ---- *************** *** 40,47 ****
    ! ( record )
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL: ">
    ! Total Number of Items:     		! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number of Items:
    ! - --- 43,49 ----
    Item TypeClass Location Date Due
    ! *************** *** 51,57 **** ! ! ! --- 53,58 ---- ! ! *************** *** 70,74 ****
    Item Type Location Date Due
    !


    --- 71,75 ---- !


    Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** opac-main.tmpl 7 Jan 2004 17:53:35 -0000 1.14 --- opac-main.tmpl 11 Feb 2004 08:57:17 -0000 1.15 *************** *** 3,7 **** ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** request.tmpl 9 Dec 2003 10:28:58 -0000 1.10 --- request.tmpl 11 Feb 2004 09:01:41 -0000 1.11 *************** *** 2,6 ****
    - /images/place-request.gif" align=right > "> --- 2,5 ---- *************** *** 37,50 **** ! Next Available,
    (or choose from list below) ! ! --- 36,49 ----
    /images/background-mem.gif">Request/images/background-mem.gif">Item Type /images/background-mem.gif">Classification /images/background-mem.gif">Volume ! Next Available, or choose from list below
    ! ! *************** *** 143,150 **** ! Next Available ! This type only : --- 142,149 ---- ! Next Available ! This type only : *************** *** 156,161 ****
    /images/background-mem.gif">Request/images/background-mem.gif">Item type /images/background-mem.gif">Classification /images/background-mem.gif">Volume
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png">
    --- 155,161 ---- ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> ! Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** shelves.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- shelves.tmpl 11 Feb 2004 09:01:41 -0000 1.3 *************** *** 1,41 **** -

    Logged in as: [Log Out]

    - - !
    ! ! Shelf List

    ! ! - - - !
    ! ! !
    Add a book by barcode:
    !
    ! ! !
    "> ! Contents of shelf !
    !
    ">">" width=10 align=center> ">" width=10 align=center> ">" width=10 align=center> ">
    !
    ! "> ! ! "> ! !

    --- 1,47 ---- !
    !
    ! ! ! ! !
    "> ! Contents of !
    ">"> "> "> ">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Add a book by barcode in : ! ! ! ! "> ! !
    !
    *************** *** 49,102 ****
    - Modify Shelf Contents

    Bookshelves

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Add Shelf:

    !

    ! !

    ! !
    "> ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    Add or Remove Book Shelves - ! ! \ No newline at end of file --- 55,139 ----

    Bookshelves

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Add Shelf !
    !

    !
    !

    !
    !
    ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    ! Add or Remove Book Shelves !

    ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** thesaurus_popup.tmpl 9 Dec 2003 10:28:58 -0000 1.4 --- thesaurus_popup.tmpl 11 Feb 2004 09:01:41 -0000 1.5 *************** *** 10,13 **** --- 10,14 ---- "> "> + "> "> *************** *** 19,22 **** --- 20,24 ---- "> + "> "> *************** *** 28,31 **** --- 30,34 ---- "> "> + "> insert a new authority : From tipaul at users.sourceforge.net Wed Feb 11 10:03:48 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** circulation.tmpl 9 Dec 2003 10:29:05 -0000 1.15 --- circulation.tmpl 11 Feb 2004 09:03:46 -0000 1.16 *************** *** 5,9 **** ! &branch=&printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &printer=&print=yes"> Next Borrower  *************** *** 14,24 **** !

    Circulation: Issues


    ! Branch:
    ! Printer:
    !     Change Settings "> "> -

     

    --- 14,21 ----
    !

    Circulation: Issues

    ! Branch: Printer: Change Settings "> "> *************** *** 38,42 **** Branch:
    Printer:
    ! Change Settings"> "> --- 35,39 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 141,145 ****
    ! --- 138,142 ----
    ! *************** *** 172,176 **** + + +
    ! --- 17,39 ----
    --- 169,173 ---- ! ! --- 184,188 ---- ! *************** *** 225,230 **** + *************** *** 257,263 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** moredetail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- moredetail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 *************** *** 31,38 **** Biblionumber:
    ! Item Type:
    URL:
    ! Loan Length:
    ! Rental Charge:
    Classification:
    ISBN:
    --- 31,38 ---- Biblionumber:
    ! Item type:
    URL:
    ! Loan length:
    ! Rental charge:
    Classification:
    ISBN:
    Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** searchresults.tmpl 9 Dec 2003 10:29:06 -0000 1.7 --- searchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.8 *************** *** 85,89 ****
    ! Results through of records.
    --- 85,89 ----
    ! Results through of records.
    Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** subject.tmpl 9 Dec 2003 10:29:06 -0000 1.4 --- subject.tmpl 11 Feb 2004 09:03:46 -0000 1.5 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 ****
    *************** *** 187,191 **** Item Barcode:
    Item Barcode:
    ! !
    Patron information
    " onClick="openWindow(this,'Member', 480, 640)"> --- 222,227 ---- ! ! + + + + + + + + + *************** *** 254,258 **** ! --- 260,264 ---- ! *************** *** 264,270 ****
    Borrower information
    " onClick="openWindow(this,'Member', 480, 640)"> *************** *** 233,236 **** --- 230,242 ----
    GNA>Borrower is gone with no address
    LOST>Borrower's card is lost
    DBARRED>Borrower is debarred
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    ODUESYes, See below
    ODUESYes, See below
    !



    !
    /images/background-mem.gif"> --- 270,276 ----
    !
    ! ! --- 24,31 ---- ! *************** *** 64,68 **** --- 91,101 ---- Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cmsdsearchresults.tmpl 9 Dec 2003 10:29:05 -0000 1.2 --- cmsdsearchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.3 *************** *** 24,28 ****
    /images/background-mem.gif"> From tipaul at users.sourceforge.net Wed Feb 11 10:03:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detailprint.tmpl,1.1,1.2 catalogue-home.tmpl,1.8,1.9 cmsdsearchresults.tmpl,1.2,1.3 detail-opac.tmpl,1.5,1.6 detail.tmpl,1.9,1.10 MARCdetail.tmpl,1.14,1.15 moredetail.tmpl,1.9,1.10 searchresults.tmpl,1.7,1.8 subject.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Added Files: detailprint.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** catalogue-home.tmpl 9 Dec 2003 10:29:05 -0000 1.8 --- catalogue-home.tmpl 11 Feb 2004 09:03:46 -0000 1.9 *************** *** 24,31 ****
    HELP
    ! Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

    HELP
    ! Search :Using more fields for your search will slow it down.

    		 --- 64,68 ---- *************** *** 91,101 **** ! //images/2rightarrow.png" BORDER=0 > ! ! Virtual Bookshelves
    ! ! ! Virtual Bookshelves

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** detail-opac.tmpl 9 Dec 2003 10:29:06 -0000 1.5 --- detail-opac.tmpl 11 Feb 2004 09:03:46 -0000 1.6 *************** *** 38,46 **** ! ! --- 38,46 ----
    Item Type Class Location Date DueLast Seen
    ! ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** detail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- detail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 *************** *** 25,45 ****
    " class="button">MARC

    ! Subtitle: ! Author: >
    ! Additional Author:
    ! Published by : ! in , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL:
    ! total number of Items: !

    --- 25,47 ----
    " class="button">MARC

    ! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number of Items:     *************** *** 58,67 ****

    Item type Class Location Date DueLast seen
    ! ! ! ! ! ! --- 60,68 ----
    Item TypeClassLocationDate DueLast SeenBarcode Volume
    ! ! ! ! ! *************** *** 69,77 **** ! ! ! --- 70,77 ---- ! ! *************** *** 96,115 ****
    Item typeLocationDate DueLast seenBarcode Volume
    > &item=&bib=&bi=">
    &item=&bib=&bi=">

    - - - - -
    -

    HELP
    - Update Biblio for all Items: Click on the Modify - button [left] to amend the biblio. Any changes you make will update - the record for all the items listed above.

    - Updating the Biblio for only ONE or SOME Items: - If some of the items listed above need a different biblio, or are on the - wrong biblio, you must use the - acquisitions - process to fix this. You will need to "re-order" the items, and delete them - from this biblio.

    -


    --- 96,99 ---- Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** MARCdetail.tmpl 9 Dec 2003 10:29:06 -0000 1.14 --- MARCdetail.tmpl 11 Feb 2004 09:03:46 -0000 1.15 *************** *** 19,22 **** --- 19,23 ----

    		//images/edittrash.png"> ">Normal')">Print MARC biblio :
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Subject
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !
    !

    ! Results through of records.
    --- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subject
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Results through of records.
    From tipaul at users.sourceforge.net Wed Feb 11 10:03:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.24,1.25 addbooks.tmpl,1.12,1.13 additem.tmpl,1.14,1.15 isbnsearch.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: addbiblio.tmpl addbooks.tmpl additem.tmpl isbnsearch.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** addbiblio.tmpl 9 Dec 2003 10:29:06 -0000 1.24 --- addbiblio.tmpl 11 Feb 2004 09:03:47 -0000 1.25 *************** *** 1,3 **** ! "> ! ! z3950 search
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! ! ! ! ! z3950 search
    +   + + +
    >>>>
    +     +
    *************** *** 85,88 **** --- 100,115 ---- +
    + +
    <<<<
    +     +     		+ +
    >>>>
    +     +
    *************** *** 110,113 **** --- 137,152 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 135,138 **** --- 174,189 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 160,163 **** --- 211,226 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 185,188 **** --- 248,263 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 210,213 **** --- 285,300 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 235,238 **** --- 322,337 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 260,263 **** --- 359,374 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 285,288 **** --- 396,404 ---- + + +
    <<<<
    +     + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** addbooks.tmpl 9 Dec 2003 10:29:06 -0000 1.12 --- addbooks.tmpl 11 Feb 2004 09:03:47 -0000 1.13 *************** *** 22,26 **** ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    --- 22,26 ---- ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    *************** *** 32,38 ****   ! Create Empty biblio ! Create Empty biblio --- 32,38 ----   ! Create Empty biblio ! Create Empty biblio *************** *** 52,56 **** Keyword: ! --- 52,56 ---- Keyword: ! Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** additem.tmpl 18 Dec 2003 17:19:56 -0000 1.14 --- additem.tmpl 11 Feb 2004 09:03:47 -0000 1.15 *************** *** 1,3 **** ! ! ! ! ! !
    ! ! !
    ! ! ! ! ! ! ! !
    ! ! Koha
    ! SIGB sous licence libre

     ! Koha : un don, une contribution
    en langue Maori         		!         ! Chercher dans le catalogue ! ! !
    ! Saisissez et validez avec Entrée
    ! - Recherche avancée --- 1,91 ---- ! ! ! ! Bienvenue dans l'OPAC de Koha + + ! ! !
    /images/front-background-med.gif"> ! /images/holder.gif" alt="" width="1" height="440" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! --- 93,124 ---- ! ! ! *************** *** 105,107 ****
    /images/holder.gif" alt="" width="260" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="30" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="350" height="88" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" alt="" width="1" height="30" hspace="0" vspace="0" border="0"> ! !        /images/front-arrow.gif" alt="" border="0" width="27" height="22"> ! Chercher dans le catalogue ! ! !
    ! Saisissez et validez avec Entrée.
    ! /images/front-arrow-small.gif" alt="-" width="20" height="16" hspace="0" vspace="0" border="0" align="middle"> Recherche avancée *************** *** 71,102 ****
      !         ! Acquisitions récentes !
    ! acquis
    ! dans les derniers jours !
      ! ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier

    !
      !        /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! Acquisitions récentes !
    ! acquis
    ! dans les derniers jours     !
      ! /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier

    !
    ! --- 127,130 ----
    ! ! Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-moredetail.tmpl 8 Dec 2003 16:27:45 -0000 1.4 --- opac-moredetail.tmpl 11 Feb 2004 08:46:27 -0000 1.5 *************** *** 1,28 **** !
    - -

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    - -

    S'identifier à Koha

    -     -
    ! ! &type=intra> ! ()

    ! > ! > --- 1,22 ---- !

    ! ! &type=intra> ! ()

    ! > ! >

    GROUPE
    *************** *** 34,53 ****
    ! Numéro notice ::
    ! Type d'ouvrage ::
    ! URL:
    ! Durée prêt:
    ! Coût du prêt:
    ! Classification:
    ! ISBN:
    ! Editions:
    ! Placer:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Taille:
    ! Notes:
    ! N° ouvrage:     --- 28,47 ----
    ! Numéro notice ::
    ! Type d'ouvrage:
    ! URL:
    ! Durée prêt:
    ! Coût du prêt:
    ! Classification:
    ! ISBN:
    ! Editions:
    ! Placer:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Taille:
    ! Notes:
    ! N° ouvrage:     *************** *** 55,72 ****
    GROUPE
    !     !
    CODE BARRE !
    ! > ! > ! > --- 49,66 ----
    ! !
    CODE BARRE !
    ! > ! > ! > *************** *** 75,99 ****
    ! Annexe propriétaire:
    ! Vu:
    ! Dernier prêt:
    ! on issue bit ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Coût de remplacement:
    ! Ouvrage perdu:
    ! Payé pour ::
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Annul?:
    &bi=&itm=>Total ! Issues:
    ! Groupe numéro:
    ! Notice biblio ::
    --- 69,93 ----
    ! Annexe propriétaire:
    ! Vu:
    ! Dernier prêt:
    ! En prêt \? ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Coût de remplacement:
    ! Ouvrage perdu:
    ! Payé pour ::
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Annul\?:
    &bi=&itm=>Total ! Issues:
    ! Groupe numéro:
    ! Notice biblio ::
    *************** *** 104,108 ****
    !

    --- 98,102 ----

    !

    *************** *** 110,112 **** ! --- 104,106 ---- ! Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-reserve.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-reserve.tmpl 8 Dec 2003 16:27:45 -0000 1.6 --- opac-reserve.tmpl 11 Feb 2004 08:46:27 -0000 1.7 *************** *** 1,65 **** ! !

    ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier à Koha

    !     ! ! ! !
    ! Sorry, you cannot make reserves because you owe .
    ! Impossible de faire plus de Réservations
    ! Vous avez déjà placé une réservation sur cet exemplaire
    ! Vous devez sélectionner au moins 1 type d'exemplaire
    ! Sélectionnez une annexe ou retirer l'ouvrage
    !

    !     ! !

    Réservation de l'ouvrage :: ( )

    !

    Il y a Réservations déjà faites sur cet ouvrage

    !

    Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous.

    !

    ! "> ! ! ! ! ! ! ! ! ! ! !
    ReserverType d'ouvrage : Copies
    Non réservable

    Sélectionnez l'annexe ou vous prendrez l'ouvrage: !
    !

    ! --- 1,62 ---- ! !
    ! !
    Réserver à cette date :: ! ! !
    !
    ! Désolé, vous ne pouvez pas faire de réservation parce que vous devez .
    ! Sorry, you cannot make more than reserves.
    ! Vous avez déjà placé une réservation sur cet exemplaire.
    ! Vous devez sélectionner au moins 1 type d'exemplaire
    ! Sélectionnez une annexe ou retirer l'ouvrage
    !
    ! ! !

    Réservation de l'ouvrage :: ( )

    !

    Il y a Réservations déjà faites sur cet ouvrage.

    !

    Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous..

    ! ! "> ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! !
    ReserverType d'ouvrage Copies
    "> Non réservable

    Sélectionnez l'annexe ou vous prendrez l'ouvrage: ! !

    ! *************** *** 67,112 ****
    Réserver à cette date :: ! ! !
    Annuler réservation à cette date: ! ! !
    !

    ! !

    !     ! !

    Confirmez que vous souhaitez réserver un ouvrage ::

    !

    ! ! ! ! ! ! ! ! !
    Type d'ouvrage :
    ! Qui sera retiré à .
    ! ! !
    Il y aura des frais de réservation de $
    !     ! !
    !     --- 64,113 ----
    		Annuler réservation à cette date: ! ! !
    !

    ! ! ! !

    Confirmez que vous souhaitez réserver un ouvrage ::

    !
    ! ! "> ! "> ! ! ! ! !
    /images/background-opac.gif">Type d'ouvrage
    ">
    ! Qui sera retiré à .
    ! "> ! !

    Il y aura des frais de réservation de $

    ! ! !
    ! ! ! + \ No newline at end of file Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-searchresults.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-searchresults.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-searchresults.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,66 **** ! -
    - -

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    - -

    S'identifier à Koha

    -     - - - - Recherche effectuée sur - - - acquis dans les derniers jours
    - - Vous n'avez pas spécifié de critère
    -     -     ! Réponses trouvées !

    - - - &=>/images/numbers/prev.gif border=0> - - /images/numbers/placeholder.gif border=0> - - - - /images/numbers/-highlight.gif> - - &=>/images/numbers/.gif border=0> - - - - &=>/images/numbers/next.gif border=0> - - /images/numbers/placeholder.gif border=0> - !

    ! ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif> ! --- 1,58 ---- ! !
    ! Recherche effectuée sur ! ! ! acquis dans les derniers jours
    ! ! Vous n'avez pas spécifié de critère
    ! ! + Réponses trouvées
    +
    !
    ! ! &=">/images/numbers/prev.gif" border="0" alt="Previous Page" height="14" width="15"> ! ! /images/numbers/placeholder.gif" height="14" width="15" alt="" border="0"> ! ! ! ! /images/numbers/-highlight.gif" alt="" height="14" width="15" border="0"> ! ! &=">/images/numbers/.gif" border="0" alt="" height="14" width="15"> ! ! ! ! &=">/images/numbers/next.gif" border="0" height="14" width="15" alt="Next Page"> ! ! /images/numbers/placeholder.gif" border="0" width="14" height="14" alt=""> !
    !
    ! ! !
    Sujet
    >
     
    ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif"> ! *************** *** 69,79 **** ! !
    Sujet
    ">
     
    ! /images/background-opac.gif> ! ! --- 61,71 ---- ! !
    TitreAuteur © Nombre d'ouvrages
    ! /images/background-opac.gif"> ! ! *************** *** 84,122 **** ! ! ! ! ! ! ! ! ! /images/background-opac.gif> ! ! ! ! ! ! ! ! ! ! ! ! ! --- 15,38 ---- ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 42,47 ****
    !

     

    ! --- 40,47 ----
    !

     

    ! ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** charges.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- charges.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,33 **** ! ! ! ! !

    Chaque champ doit être rempli avec le montant de l'amende, le délai ! et le cycle
    ! (par ex. 1,7,7 = € 1.- d'amende, après 7 jours, tous les 7 jours). !

    ! !

    TitreAuteur © Nombre d'ouvrages
    bgcolor='#ffffcc'>>bgcolor='#ffffcc'>>bgcolor='#ffffcc' align=center> bgcolor='#ffffcc' align=center> bgcolor='#ffffcc'> bgcolor='#ffffcc'> ! ! >Reserver ! Non réservable !
    ! ! /images/background-opac.gif> ! ! --- 76,114 ---- ! ! ! ! ! ! ! ! ! /images/background-opac.gif"> !
    ! ! &=>Précédents !   ! ! ! &=>Enregistrement suivant !   !
    bgcolor="#ffffcc">">bgcolor="#ffffcc">">bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> ! ! ">Reserver ! Non réservable !
    ! ! /images/background-opac.gif"> ! ! *************** *** 125,139 ****
    ! ! &=">Previous Records !   ! ! ! &=">Next Records !   !
    ! !
    ! Résultats à de réponses
    ! ! Désolé, aucun résultat !
    ! - Try another search - --- 117,132 ----
    ! !
    !
    Résultats à de réponses.
    ! !
    Désolé, aucun résultat !
    ! ! !
    Essayez une autre recherche
    ! Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-search.tmpl 8 Dec 2003 16:27:45 -0000 1.8 --- opac-search.tmpl 11 Feb 2004 08:46:27 -0000 1.9 *************** *** 1,88 **** ! ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier à Koha

    !     ! ! !
    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! ! ! ! !
    Mot-clefs
    OU :
    Sujet
    OU un ou plus de : :
    TitreNormalExact
    Auteur
    Illustrateur
    Classe
    Code barre
    Notez que le mot clef est prioritaire
    !
    !
    ! --- 1,71 ---- ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + ! ! ! ! !
    Mot-clefs
    OU :
    Sujet
    OU un ou plus de : :
    TitreNormalExact
    Auteur
    Illustrateur
    Classe
    Code barre
    Notez que le mot clef est prioritaire
    !
    ! Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-user.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-user.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-user.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,19 **** ! ! ! ! ! ! --- 1,20 ---- ! ! !
    Est-ce correct?
    Carte lecteur:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !

    quelque chose à modifier ??

    Mettre à jour
    ! ! ! *************** *** 21,135 **** ! ! Bonjour, ! [Déconnecter]

    ! ! ! !

    Est-ce correct
    Carte lecteur:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !
    quelque chose à modifier \?

    Mettre à jour +
    ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez des dettes de
    !     ! !
    ! ! Vous avez un crédit de
    !     ! Voir compte !     ! ! ! ! ! !
    ! ! Vous avez des réservations en attente: -

    ! Prendre à ::
    !     -

    - ! Vous avez Ouvrage en prêt actuellement
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate retourType d'ouvrageChargesPrêt
    OuiNonOuiNon
    ! !

    Vous n'avez pas d'exemplaire en prêt

    ! ! !

    ! ! ! Vous avez Ouvrages réservés actuellement
    ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate réservation
    !     ! --- 22,135 ---- ! !
    ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez un crédit de
    ! !

    Voir compte

    ! ! ! ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! !
    ! ! Vous avez des réservations en attente:
    TitreAuteurDate réservationAnnexe de retrait
    ! "> 

     

    ! ! ! !

    You have Ouvrage en prêt actuellement.

    ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate retourType d'ouvrageChargesPrêt
    "> YesNoYesNo
    ! !

    Vous n'avez pas d'exemplaire en prêt.

    ! ! ! ! !

    You have Ouvrages réservés actuellement.

    ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate réservation
    "> 
    ! ! Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-userupdate.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-userupdate.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-userupdate.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,56 **** ! ! !

    Connecté en tant que: [Déconnecter]

    ! !

    S'identifier à Koha

    !     ! Changer le nécessaire
    ! Your changes won't appear until the library has validated them.

    ! !
    !
    ! ! ! ! ! ! ! ! ! - - ! ! ! ! - - ! ! ! !
    Nom
    Titre
    Prénom
    Adresse postale
    Ville
    Téléphone maison
    Tel bureau
    Mail
    !
    !
    !
    !     ! ! --- 1,47 ---- ! !

    Changer le nécessaire.
    ! Vos changement n'apparaitront que lorsque la bibliothèque les aura validé.

    ! !
    ! ! ! ! ! ! ! ! ! ! ! + + ! ! ! ! + + + !
    Nom " name="surname">
    Titre " name="title">
    Prénom " name="firstname">
    Adresse postale " name="streetaddress">
    Ville " name="city">
    Téléphone maison " name="phone">
    Tel bureau " name="faxnumber">
    Mail " name="emailaddress">
    !
    ! ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** subject.tmpl 8 Dec 2003 16:27:45 -0000 1.4 --- subject.tmpl 11 Feb 2004 08:46:27 -0000 1.5 *************** *** 1,44 **** ! ! ! !

    Connecté en tant que: [Déconnecter]

    ! !

    S'identifier à Koha

    !     ! !
    ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Sujet
    >
     

    ! Results à de réponses
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Sujet
    ">
     

    ! Résultats à de réponses.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From tipaul at users.sourceforge.net Wed Feb 11 09:59:14 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:59:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.1,1.2 auth.tmpl,1.1,1.2 member-flags.tmpl,1.1,1.2 moditem.tmpl,1.1,1.2 modwebsites.tmpl,1.1,1.2 newjmember.tmpl,1.1,1.2 reports.tmpl,1.1,1.2 reservereport.tmpl,1.1,1.2 shelves.tmpl,1.1,1.2 stats.tmpl,1.1,1.2 updatebiblio.tmpl,1.1,1.2 bookcount.tmpl,1.1,1.2 boraccount.tmpl,1.4,1.5 charges.tmpl,1.1,1.2 default.tmpl,1.1,1.2 intranet-main.tmpl,1.6,1.7 mancredit.tmpl,1.1,1.2 maninvoice.tmpl,1.1,1.2 modbibitem.tmpl,1.1,1.2 modbib.tmpl,1.2,1.3 newimember.tmpl,1.2,1.3 newmember.tmpl,1.3,1.4 opac-main.tmpl,1.1,1.2 overdue.tmpl,1.1,1.2 request.tmpl,1.5,1.6 searchheader.tmpl,1.1,1.2 thesaurus_popup.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26987/koha-tmpl/intranet-tmpl/default/fr Modified Files: bookcount.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl modbibitem.tmpl modbib.tmpl newimember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl request.tmpl searchheader.tmpl thesaurus_popup.tmpl Added Files: about.tmpl auth.tmpl member-flags.tmpl moditem.tmpl modwebsites.tmpl newjmember.tmpl reports.tmpl reservereport.tmpl shelves.tmpl stats.tmpl updatebiblio.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: bookcount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** bookcount.tmpl 3 Feb 2003 10:54:59 -0000 1.1 --- bookcount.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,46 **** ! !
    !
    ! ! &type="intra"> () ! !

    ! ! ! ! ! ! ! ! ! ! !
    CODE BARRES !
    ! ! Site d'origine :
    ! Site actuel :
    ! Date d'arrivée sur le site actuel : !
    ! Nombre de sortie depuis cette date :
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Site Nombre de sorties Dernière apparition sur le site
    !
    ! !

    \ No newline at end of file --- 1,40 ---- ! !
    !
    !

    ! &type="intra"> ()

    !

    ! ! ! ! ! ! ! ! !
    ! CODE BARRE !
    ! ! Annexe propriétaire:
    ! Annexe:
    ! Date d'arrivée à l'Annexe:
    ! Nombre de prêt depuis la date ci-dessus:
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Annexe Nombre de prêts Vu à l'Annexe
    !
    ! ! Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** boraccount.tmpl 18 Sep 2003 10:19:29 -0000 1.4 --- boraccount.tmpl 11 Feb 2004 08:58:38 -0000 1.5 *************** *** 1,10 **** ! ! Compte de ! !

    ! Ajouter une dette   ! Encaisser

    --- 1,10 ---- ! ! ! !

    Compte pour ">

    ! Créer une facture manuelle   ! Créer un crédit manuel

    *************** *** 15,40 ****

    /images/background-mem.gif" colspan=2>AMENDES ! & FRAIS/images/background-mem.gif" colspan=1>MONTANT/images/background-mem.gif" colspan=1>SOLDE !
    Total dû
    /images/background-mem.gif" colspan=2>AMENDES & FRAIS/images/background-mem.gif" colspan=1>MONTANT/images/background-mem.gif" colspan=1>DOIT ENCORE
    Total dû
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! \ No newline at end of file --- 1,32 ---- ! ! ! ! !

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours.

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! \ No newline at end of file Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/default.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** default.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- default.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,35 **** !

    ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurNbre de doc.Localisation
    >
    ! ! ! !
    &startfrom=>Résultats ! précédants &startfrom=>Résultats ! suivants

    ! Résultats à ! sur enregistrements. !
    ! !
    --- 1,28 ---- !
    ! ! ! ! ! ! !
    TitreAuteurNombre d'ouvragesBiblionumber
    >
    !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !

    ! Résultats à sur enregistrements. !
    ! Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** intranet-main.tmpl 4 Apr 2003 08:40:08 -0000 1.6 --- intranet-main.tmpl 11 Feb 2004 08:58:38 -0000 1.7 *************** *** 1,188 **** ! ! Bienvenue sur l'Intranet Koha ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,158 ---- ! ! ! ! Bienvenue dans l'intranet de Koha ! ! ! ! ! ! !
    Catalogue
    !
    ! Koha: Horowhenua Library Trust    		 ! ! !
    ! Après la saisie, ! pressez la touche Entrée.
    ! ! Recherche avancée (Plus d'options)
    ! !
    ! ! Lecteurs !
    ! ! !
    ! Après la saisie, ! pressez la touche Entrée.
    !
    Acquisitions
    !
    Etats
    !
    Paramètres
    !
    Circulation
    ! ! ! --- 7,11 ---- ! *************** *** 13,19 **** --- 13,19 ---- *************** *** 21,60 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + + + + ! ! *************** *** 191,195 ****
    /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
    /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Recherche Catalogue" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
    ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">    		   ! !
    !
    ! ! Saisissez une valeur et pressez la touche Entrée..
    ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Recherche avancée (plus d'options)
    !
    ! ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
      ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Recherche Lecteur" name="member" hspace="0" vspace="0" border="0"> !
      
    ! !
    ! Saisissez une valeur et pressez la touche Entrée..
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
         /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Acquisitions" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
         /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Accounts et Reports" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Paramètres" border="0">
    + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
      /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Circulation" hspace="0" vspace="0" border="0">
    - --- 161,164 ---- Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** mancredit.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- mancredit.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,32 **** ! ! !
    !

    Crédit manuel

    !
    !
    ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Numéro de lecteur
    Type de crédit ! !
    Numéro de document
    Description
    Montant
    !
    ! ! \ No newline at end of file --- 1,22 ---- ! ! !

    Crédit manuel

    !
    ! ! "> ! ! ! ! ! ! !
    N° Lecteur
    Saisir ! !
    Itemnumber
    Description
    Montant
    !
    ! ! \ No newline at end of file Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** maninvoice.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- maninvoice.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,37 **** ! ! !
    !

    Facture manuelle

    !
    !
    ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Numéro de lecteur
    Type de facture ! !
    Numéro de document
    Description
    Montant
    ! !
    !
    ! ! --- 1,25 ---- ! ! !

    Facture manuelle

    !
    ! ! "> ! ! ! ! ! ! !
    N° Lecteur
    Saisir ! !
    Itemnumber
    Description
    Montant
    !
    ! ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modbibitem.tmpl 7 Aug 2003 14:41:23 -0000 1.1 --- modbibitem.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,5 **** ! !

    "&type=intra> ()
    ! Modifier Groupe -


    --- 1,5 ---- ! !

    "&type=intra> ()
    ! Modifier groupe


    *************** *** 7,11 ****
    Assigner à un groupe existant
    RE-ASSIGNE AU GROUPE EXISTANT
    OR MODIFY DETAILS
    Item Type" size=20>
    URL" size="20">
    Class" size=20>
    Publisher" size=20>
    Place" size=20>
    ISBN" size=20>
    Publication Year" size=20>
    Pages" size=20>
    Illustrations" size=20>
    Volume" size=20>
    Notes">
    Size" size=20>
    --- 21,60 ----
    ou modifie les détails
    Catég ouvrage" size=20>
    URL" size="20">
    Catégorie" size=20>
    Editeur" size=20>
    Lieu" size=20>
    ISBN" size=20>
    Année de publication" size=20>
    Pages" size=20>
    Illustations" size=20>
    Volume" size=20>
    Notes">
    Taille" size=20>
    *************** *** 68,96 **** ! CHANGES TO AFFECT THESE BARCODES
    ! Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.   ! Barcode ! Location ! Date Due ! Last Seen ! ! "> ! "&bib=""&bi="""> ! ! !

    ! --- 68,96 ---- ! MODIFS SUR CES CODES-BARRES
    ! Sélectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-sélectionnés ne seront pas affectés.   ! Code barre ! Localisation ! Date de retour ! Vu ! ! "> ! "&bib=""&bi="""> ! ! !

    ! *************** *** 99,106 **** ! HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some ! items, tick the appropriate ones and a new group record will be created automatically for them.

     

    ! --- 99,106 ---- ! AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some ! items, tick the appropriate ones et a new group record will be created automatically for them.

     

    ! Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** modbib.tmpl 6 Jun 2003 09:31:52 -0000 1.2 --- modbib.tmpl 11 Feb 2004 08:58:38 -0000 1.3 *************** *** 1,63 **** ! ! ">Modifier Liens web ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Auteur">
    Titre">
    Résumé
    Sujet
    Copyright">
    Titre périodique">
    Autres auteurs">
    Sous titre">
    Titre uniforme">
    Notes
    Périodique">

    ! ! --- 1,63 ---- ! ! ">Modifier Site Web Links
    ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Auteur">
    Titre">
    Résumé
    Sujet
    Date Copyright">
    Titre Séries">
    Auteur supplémentaire">
    Sous-titre">
    Titre uniforme">
    Notes
    Périodiques">

    !
    ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** newimember.tmpl 6 Jun 2003 10:00:52 -0000 1.2 --- newimember.tmpl 11 Feb 2004 08:58:38 -0000 1.3 *************** *** 1,22 **** ! ! ! Les champs obligatoires ! suivants n'ont pas été saisis. Veuillez retourner à la page ! précédantes et compléter les champs. ! ! ! ! Numéro de carte erroné. ! ! Valeurs correctes. Cliquer sur OK pour valider.
    ! ! " value=""> !
    !     !     ! --- 1,180 ---- ! ! ! ! ! ! N° carte invalide.

    ! !

    Confirmer Enregistrement

    ! ! " > ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! !
    /images/background-mem.gif"> ! NOUVEAU LECTEUR !
    ! Nom ! ! !
    /images/background-mem.gif"> ! DETAILS LECTEUR !
    ! N° Lecteur ! ! !
    ! N° Carte ! ! !
    ! Annexe d'inscription ! ! !
    /images/background-mem.gif"> ! ADRESSE LECTEUR !
    ! Adresse postale ! ! !
    ! Adresse privée ! ! !
    /images/background-mem.gif"> ! DETAILS LECTEUR !
    ! Téléphone (Accueil) ! ! !
    ! Téléphone (Daytime) ! ! !
    ! Fax ! ! !
    ! E-mail ! ! !
    ! Ecriture d'un texte ! ! !
    /images/background-mem.gif"> ! DETAIL AUTRE CONTACT !
    ! Nom ! ! !
    ! Téléphone ! ! !
    ! Relation ! ! !
    ! Notes ! ! !
    /images/background-mem.gif"> ! NOTES !
    ! Notes générales ! ! !

    ! Valeurs valides. Cliquez sur OK pour confirmer ce nouveau lecteur

    ! ! " value=""> !
    ! ! ! Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/newmember.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** newmember.tmpl 6 Nov 2003 10:18:34 -0000 1.3 --- newmember.tmpl 11 Feb 2004 08:58:38 -0000 1.4 *************** *** 1,10 **** ! ! !

    Confirmer l'enregistrement

    ! " > ! --- 1,10 ---- ! ! !

    Confirmer Enregistrement

    /images/background-mem.gif"> ! NOUVEAU LECTEUR
    ! " > ! *************** *** 14,47 **** ! " > ! --- 14,47 ---- ! " > ! *************** *** 51,55 **** --- 51,55 ---- *************** *** 59,83 **** ! " > ! --- 59,83 ---- ! " > ! *************** *** 88,92 **** --- 88,92 ---- *************** *** 96,105 **** ! " > ! --- 96,109 ---- ! " > ! *************** *** 109,142 **** ! " > ! --- 113,146 ---- ! " > ! *************** *** 146,150 **** --- 150,154 ---- *************** *** 154,171 **** ! " > ! --- 158,175 ---- ! " > ! *************** *** 175,187 **** --- 179,191 ---- *************** *** 191,195 **** --- 195,199 ---- *************** *** 199,207 **** ! " > ! --- 203,211 ---- ! " > ! *************** *** 209,251 ****
    /images/background-mem.gif"> ! NOUVEAU LECTEUR
    !
    /images/background-mem.gif"> ! Détails
    ! Numéro interne !
    ! Numéro de carte !
    ! Catégorie de lecteur !
    !
    /images/background-mem.gif"> ! DETAILS LECTEUR
    ! N° Lecteur !
    ! N° Carte !
    ! Catégorie Lecteur !
    !
    !
    !
    ! Date expiration !
    ! Annexe de rattachement !
    /images/background-mem.gif"> DETAILS PERSONNELS !
    ! Date d'expiration !
    ! Annexe d'inscription !
    /images/background-mem.gif"> DETAILS PERSONNELS !
    !
    !
    /images/background-mem.gif"> ! ADRESSE
    ! ! Male ! ! Female !
    /images/background-mem.gif"> ! ADRESSE LECTEUR
    !
    ! Adresse !
    /images/background-mem.gif"> ! CONTACTS
    ! Téléphone (maison) !
    ! Téléphone (bureau) !
    !
    ! Adresse privée !
    /images/background-mem.gif"> ! DETAILS LECTEUR
    ! Téléphone personnel !
    ! Téléphone professionnel !
    !
    !
    !
    ! Texte !
    /images/background-mem.gif"> ! AUTRES CONTACTS
    !
    ! Ecriture d'un texte !
    /images/background-mem.gif"> ! DETAIL AUTRE CONTACT
    !
    ! Téléphone !
    !
    ! Téléphone !
    !
    !
    !
    /images/background-mem.gif"> NOTES !
    /images/background-mem.gif"> NOTES
    ! Notes générales !

    ! ! " value=""> !
    !

    ERREUR

    !

    Les champs suivants sont erronés. Cliquer sur le bouton "retour" et corrigez.

    ! ! Numéro carte lecteur vide
    !     ! ! Numéro de carte invalide
    !     ! ! Zone sexe vide
    !     ! ! Zone nom vide
    !     ! ! Zone prénom vide
    !     ! ! Adresse vide
    !     ! ! Commune vide
    !     !     ! --- 213,255 ---- ! Notes générales !

    ! ! " value=""> !
    !

    ERREUR

    !

    Les champs suivants contiennent une valeur interdite. Cliquez sur le bouton Précédent et essayez à nouveau :

    ! ! N° Carte
    ! ! ! N° carte invalide
    ! ! ! Sexe
    ! ! ! Prénoms
    ! ! ! Nom
    ! ! ! Rue
    ! ! ! Localité
    ! ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/opac-main.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-main.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- opac-main.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,133 **** ! ! Bienvenue sur l'OPAC Koha ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! Après la saisie, pressez la touche Entrée.
    ! -Recherche avancée ! (Plus d'ptions)
    ! ! !

    ! !

    Connecté en tant que: ! [Déconnexion]

    ! !

    Connectez-vous à Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue et Lecteur Services    		Rechercher dans le catalogue
       
    ! !
    ! ! Saisir in the box et press the enter key.
    ! ! ! -Recherche avancée (plus d'options)
    ! ! !

    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! !
    ! !
    !

    !

    Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** overdue.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- overdue.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,38 **** ! ! ! ! ! ! Documents en retard au
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Date de retourLecteurTéléphoneTitreAuteur
    ?subject=Overdue: ">
    ! ! ! ! ! ! ! \ No newline at end of file --- 1,32 ---- ! ! ! !

    Ouvrages en retard depuis


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Date de retourUtilisateurTéléphoneTitreAuteur
    ?subject=Signaler retard: ">
    ! ! ! ! Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/request.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** request.tmpl 17 Sep 2003 12:24:47 -0000 1.5 --- request.tmpl 11 Feb 2004 08:58:38 -0000 1.6 *************** *** 1,11 **** !

    ! "> ! "> ! Réserver : ! > ! )

    --- 1,11 ---- ! ! "> ! "> !

    Réserver: ! > !

    *************** *** 13,22 **** ! ! ! ! ! ! --- 13,22 ----
    /images/background-mem.gif">Ordre/images/background-mem.gif">N° lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Pris/images/background-mem.gif">Réservé
    ! ! ! ! ! ! *************** *** 24,162 **** ! !
    /images/background-mem.gif">Rang/images/background-mem.gif">N° Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Ramassage/images/background-mem.gif">Réservation
    ! Prochain dispo,
    (ou choisir dans la liste ci après)
    !

    ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Réservation/images/background-mem.gif">Type exemplaire/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Date pub/images/background-mem.gif">Copies
    ! ! Sélection impossible ! ! > ! > ! ! ! ! ! ! !
    !

     

    !
    action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>Modifier réservations existantes
    /images/background-mem.gif">Ordre/images/background-mem.gif">Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Pris/images/background-mem.gif">Réservé
    ! > ! > ! > ! Exemplaire en attente à > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Prochain dispo ! ! ! Seulement du type ! ! ! ! $type
    ! Supprimer une réservation en choisissant "Suppr" dans la la liste d'ordre ! //images/2rightarrow.png">
    --- 24,161 ---- ! ! ! Prochain dispo, ou choix dans la liste ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Réservation/images/background-mem.gif">Catég ouvrage/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Date de publication/images/background-mem.gif">Copies
    ! ! Ne peut pas être sélectionné ! ! > ! > ! ! ! ! ! ! !
    !
    +

     

    !
    action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODIFIER DEMANDES EXISTANTES
    /images/background-mem.gif">Rang/images/background-mem.gif">Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Ramassage/images/background-mem.gif">Réservation
    ! > ! > ! > ! Ouvrage en attente à > ! ! ! ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;"> ! ! ! ! Suivant ! ! ! This type only : ! ! ! !
    ! Supprimer une demande en sélectionnant "suppr." dans la liste. ! //images/2rightarrow.png"> !
    *************** *** 165,167 ****
    ! --- 164,166 ---- ! Index: searchheader.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/searchheader.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** searchheader.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- searchheader.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,4 **** ! >Résultats ! triés selon l'indice dewey | >Résultats ! triés selon la cote !
    --- 1,2 ---- ! >Résultats with dewey | >Résultats with biblionumber !
    Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** thesaurus_popup.tmpl 14 Nov 2003 22:00:44 -0000 1.3 --- thesaurus_popup.tmpl 11 Feb 2004 08:58:38 -0000 1.4 *************** *** 1,47 **** ! Saisie des entrées du thésaurus
    !

    ! Rechercher : "> ! "> ! "> !

    ! Descendre : ! "> ! "> ! "> ! ! !
    ! Sélectionner : ! "> ! "> ! ! "> ! ! !
    ! "> ! "> ! Insérer une nouvelle autorité : "> !
    ! ! --- 224,239 ----

    ! "> ! Reading Record ! ! ! Index: pay.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** pay.tmpl 18 Sep 2003 12:33:02 -0000 1.5 --- pay.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,49 **** ! ! Dettes à régler ! pour !

    ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! -
    AMENDES ! ET FRAISMONTANT ! DU
    ! " value="oui" checked>A payer ! ! " value="oui">Payé ! " value="wo">Abandonner ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value="">
     Montant total
    !

    !

     

    ! --- 1,48 ---- ! ! !

    Payer une amende pour

    +

    ! ! ! "> ! ! ! ! ! ! ! ! !
    AMENDES & FRAISMontant de l'avoir
    " value="no" checked>Unpaid ! " value="oui">Pay ! " value="wo">Writeoff ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value="">
    Total dû
    !
    +

    !

     

    ! !
    ! ">Return to Lecteur Record ! ! ! Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** readingrec.tmpl 18 Sep 2003 12:33:02 -0000 1.3 --- readingrec.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,38 **** ! ! ! ! ! ! ! ! ! !
    ! [&limit=full">Liste complète] ! [">Emprunts récents]
    &order=title&limit=">TITRE ! &order=author&limit=">AUTEUR ! ! &limit=">DATE Volume
    !   !   !   !  
    ! --- 1,55 ---- ! +

    +
    N° Lecteur: +
    N° Carte: +

    + + &limit=full">Full output +
    + +
    ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! &order=title&limit=">TITRE /images/background-mem.gif"> ! &order=author&limit=">AUTEUR /images/background-mem.gif"> ! &limit=">DATE RETOUR ! /images/background-mem.gif"> ! &order=returndate&limit=">RENDU ! /images/background-mem.gif"> Volume
    !   !   !   !   !   !
    ! !
    ! ">Return to Lecteur Record ! ! ! ! From tipaul at users.sourceforge.net Wed Feb 11 09:59:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:59:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters categoryitem.tmpl,1.1,1.2 admin-home.tmpl,1.5,1.6 aqbookfund.tmpl,1.4,1.5 aqbudget.tmpl,1.4,1.5 authorised_values.tmpl,1.6,1.7 branches.tmpl,1.6,1.7 categorie.tmpl,1.5,1.6 charges.tmpl,1.1,1.2 checkmarc.tmpl,1.3,1.4 currency.tmpl,1.1,1.2 itemtypes.tmpl,1.2,1.3 koha2marclinks.tmpl,1.3,1.4 marc_subfields_structure.tmpl,1.3,1.4 marctagstructure.tmpl,1.7,1.8 printers.tmpl,1.1,1.2 stopwords.tmpl,1.2,1.3 systempreferences.tmpl,1.3,1.4 thesaurus.tmpl,1.5,1.6 z3950servers.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27288/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Added Files: categoryitem.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** admin-home.tmpl 6 Oct 2003 13:40:49 -0000 1.5 --- admin-home.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,93 **** !

    ! Page d'administration de koha
    ! ! /images/background-mem.gif"> !
    Paramètres
    ! ! ! ! ! ! ! ! ! ! ! - - - - - - - ! ! ! ! ! ! ! ! ! ! ! ! !
    En rapport avec les bibliographies
    Types d'exemplairesLes supports physiques d'un exemplaire
    FondsLes différents fonds et leurs budgets
    AmendesLes amendes en fonction du type d'exemplaire et du type de lecteur.
    Valeurs autoriséesLes différentes catégories et les valeurs autorisées pour chaque catégorie. ! Les valeurs autorisées sont utilisées dans la saisie des notices MARc pour faciliter la saisie.
    ThésaurusGestion du thésaurus. Vous pouvez définir autant de thésaurus que nécessaires au travers de la définition de "catégories" de thésaurus
    MARC
    Structure MARCLa structure MARC : les champs et les sous champs
    Liens koha - structure MARCLes liens entre la base "standard" de koha et la base MARC. Notez que ces liens peuvent être définis depuis la structure MARC. Cet utilitaire est un raccourci pour valider et corriger les liens
    Vérifier la structure MARCVérifie la structure MARC. UTILISEZ-LE avant de travailler avec des données réelles. Il vous indiquera les erreurs de configuration qui CASSENT la cohérence de la base de données
    Divers
    AnnexesLes différentes annexes gérées par ce serveur koha
    catégoriesLes différents types de lecteurs
    MonnaiesLes monnaies des fournisseurs
    ImprimantesLes imprimantes (chemin UNIX)
    Mots videsListe des mots ignorés pendant les recherches
    serveurs Z39.50Serveurs z39.50 pour rechercher des notices
    Préférences systèmesLes préférences systèmes.
    ! ! /images/background-mem.gif"> !
    Utilitaires
    ! ! ! ! ! ! ! ! ! ! -
    Export
    Export de noticesExport au format MARC
    Import
    Décharger des notices MARC
    dans le réservoir    		Le réservoir est une table ou sont stockées des notices inactives.
    ! Une notice MARC est stockée dans le réservoir tant qu'il n'y pas d'exemplaire correspondant. Si vous entrez l'ISBN ou le titre d'un ouvrage, il est recherché dans le réservoir. ! S'il est trouvé, une notice active sera créée.
    ! --- 1,104 ---- !
    !

    Paramètres


    ! ! !
    Paramètres système
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
    AnnexesLes différentes annexes que vous gérez avec ce serveur Koha.
     
    ComptesAdministration des comptes. N'oubliez pas d'éditer vos comptes avant de commencer à éditer les budgets..
    MonnaiesDéfinir taux de change.
     
    Categ. ouvragesDéfinir types de document.
    Catégories d'emprunteursDéfinir catégories d'emprunteurs.
    FraisFrais en fonction du type de document / de lecteur.
     
    Valeurs autoriséesDéfinir des catégories et des valeurs autorisées pour eux. Les valeurs autorisées sont utilisées pour aider à l'édition des notices MARC..
    ThésaurusGestion du thésaurus et des fichiers autorités.
    Structure des étiquettes MARCstructure MARC: étiquettes puis sous-champs.
    Liens Koha - base de données MARCDéfinir les liens entre les bases de données standards Koha et MARC. Ces liens peuvent être définis à partir de la structure MARC. Cet outil est simplement un raccourci pour accélérer la création des liens..
    Vérification MARCContrôle la structure MARC. A utiliser avant de travailler avec de vraies données. Cela permet de mettre en évidence les erreurs qui peuvent corrompre la base de données.
    Divers paramètres
    ImprimantesImprinantes (chemin UNIX).
    Mots vide de sensMots effacés lors des recherches.
    Serveurs Z39.50serveurs à interroger pour des données MARC.
    Préférences systèmePréférences système.
    ! ! !
    Outils
    ! ! ! ! ! ! ! ! ! ! ! ! !
    Export
    Exporter une notice biblio MARC Exporter en format MARC.
    Importer
    Charger des notices MARC dans le réservoirLe réservoir est une table dans laquelle sont stockées des notices qui seront récupérées pour un catalogage rapide..
    ! Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** aqbookfund.tmpl 4 Jul 2003 14:04:02 -0000 1.4 --- aqbookfund.tmpl 11 Feb 2004 08:59:50 -0000 1.5 *************** *** 1,52 **** ! ! ! Gestion du fonds documentaire !
    ! ! !
    ! !
    ! Votre recherche : !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaireNomModifSuppr
    ?op=add_form&bookfundid= ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&bookfundid=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
     Budget">//images/filenew.png" ALT="Add budget" border=0>
      ! - : ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

          
    //images/filenew.png" ALT="Add budget" BORDER=0 >

    !

     

    !
    ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaire">
    Fonds documentaire
    Nom 
    Groupe
     
    !     Données enregistrées !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! !
    !

     

    ! ! ! ! Donnée supprimée !
    ! !     !
    /images/background-mem.gif">Fonds documentaire/images/background-mem.gif">
    Nom
    Groupe
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! !
    --- 101,143 ---- } !

    !
    ! ! ! ! ! !
    Compte>
    Compte
    Nom 
     
    ! ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! !
    !

     

    ! ! ! ! Donnée effacée ! ! ! ! Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** aqbudget.tmpl 4 Sep 2003 17:01:59 -0000 1.4 --- aqbudget.tmpl 11 Feb 2004 08:59:50 -0000 1.5 *************** *** 1,37 **** ! ! ! Gestion budgétaire !
    ! ! ! ! !
    ! Votre recherche !


    !

    Compte
    Nom
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! !
    /images/background-mem.gif">Fonds documentaire/images/background-mem.gif">Date de début/images/background-mem.gif">Date de fin/images/background-mem.gif">Montant du budget/images/background-mem.gif"> /images/background-mem.gif"> 
    ()">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    !
          
    //images/filenew.png" ALT="Add budget" BORDER=0 >

    !
    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaire>
    Fonds documentaire
    fonds">
    Date de début () 
    Date de fin ()
    Montant du budget">
     

    !

     

    !     Données enregistrées !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Budget/images/background-mem.gif">
    Date de début
    Date de fin
    Montant du budget
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! !
    !     ! ! ! Donnée supprimée !
    !     !     --- 77,149 ---- } !

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Compte>
    Nom de compte
    Comptes">
    Date de début () 
    Date de fin ()
    Montant budget
     ">

    !

     

    ! ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Compte ! ! !
    Date de début
    Date de fin
    budgetamount
    CONFIRMER SUPPRESSION
    ! ! ! ! Donnée effacée !
    ! ! Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** authorised_values.tmpl 21 Oct 2003 15:47:06 -0000 1.6 --- authorised_values.tmpl 11 Feb 2004 08:59:50 -0000 1.7 *************** *** 1,111 **** ! ! !

    !
    ! ! ! ! ! ! ! !
    Catégorie
    Valeur autorisée
    Lib
     ">
    !     ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! Gestion des valeurs autorisées !

    Cette table est utilisée pour la définition MARC. Vous pouvez définir autant de catégories que vous le souhaitez et autant de valeurs autorisées voulues dans chaque catégorie.

    !

    Lorsque vous définissez la structure de sous-champ MARC, il est possible de faire un lien entre le sous-champ et une valeur autorisée. Lorsque l'utilisateur demande à ajouter ou à modifier une notice le sous-champ ! n'est pas renseigné par un champ vide mais par une liste de valeurs autorisées.

    ! Nouvelle catégorie... ! !
    /images/background-mem.gif">Variable/images/background-mem.gif">
    Valeur
    CONFIRMEZ LA SUPPRESSION
    ! ! !
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Catégorie/images/background-mem.gif">Valeur autorisée/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! !
    ! "> !
    //images/filenew.png" border="0">
    !
    ! ! --- 1,104 ---- ! ! !

    !
    ! ! ! ! ! !
    Catégorie
    Valeur autorisée
    Lib
     ">
    ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! !

    Admin Valeurs autorisées

    !

    Cette table est utilisée dans les définitions MARC. Vous pouvez définir autant de catégories et autant de valeurs autorisées pour chaque catégorie que vous voulez.

    !

    Quand vous définissez la structure des sous-champs MARC, vous pouvez lier un sous-champ à une catégorie de valeurs autorisées. Quand l'utilisateur ajoute ou modifie une notice biblio, la valeur du sous-champ n'est pas libre, mais doit appartenir à la liste des valeurs autorisées.

    ! Nouvelle catégorie... ! !
    VariableLib
    Valeur
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    CatégorieValeur autoriséeLibEditerSupprimer
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! ! "> !

    ! ! ! Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branches.tmpl 4 Jul 2003 14:04:02 -0000 1.6 --- branches.tmpl 11 Feb 2004 08:59:50 -0000 1.7 *************** *** 1,81 **** ! ! !
    ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code annexe ! ! ! ! ! ! !
    Nom 
    ! !
    >
    Adresse
     
     
    Téléphone
    Fax
    E-mail
     
    !
    !     ! Confirmez la suppression : !
    ! ! ! ! !
    ! !
    !
    ! ! !
    ! !
    !
    --- 1,82 ---- ! ! ! !


    ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code Annexe ! ! ! ! ! ! !
    Nom"> 
    !
    >
    Adresse
     
     
    Téléphone
    Fax
    E-mail
     
    ! ! ! ! ! Confirmer suppression: !
    ! > !
    +
    + +
    + + + +


    + *************** *** 88,202 **** ! ! ! ! ! ! ! ! !
    Code AdresseCatégories    
    ! ! (nothing entered) ! ! ! ! !
    ! !
    ! !
    Ph:     ! !
    Fax:     ! !
    Email:     !     !     		! ! (no categories set) ! ! !
    !     !     !     		!
    ! ! !
    		!
    ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Catégories d'annexes
    NomCodeDescription  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !     ! !


    !
    ! ! ! --- 89,214 ---- ! ! ! ! ! ! ! ! !
    Code caté annexe ! ! ! ! ! !
    Nom"> 
    Description"> 
    Code AdresseCatégories    
    ! ! (pas de saisie) ! ! ! ! !
    ! !
    ! !
    Tél.: ! !
    Fax: ! !
    E-mail: ! !     		! ! (pas de catégorie définie) ! ! !
    ! ! !     		! ! ! ! !
    ! !

    +
    method=post> + + +
    + +
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Catégories Annexes !
    NomCodeDescription  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! ! !


    !
    ! ! ! *************** *** 205,221 ****
    Code Catégorie ! ! ! ! ! !
    Nom"> 
    Description"> 
    ! ! ! Confirmer suppression : !
    !
    !
    !
    !     ! --- 217,233 ---- ! ! ! Confirmer suppression: !
    !
    !
    !
    ! ! Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** categorie.tmpl 5 Nov 2003 11:15:51 -0000 1.5 --- categorie.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,5 **** ! ! ! !

    Modifier categorie

    ! !

    Ajouter categorie

    !     ! !
    name=Aform method=post> ! ! ! ! ! ! ! ! ! ! ! ! --- 60,141 ---- ! !

    Modifier Catégorie

    ! !

    Ajouter une catégorie

    ! ! ! name=Aform method=post>
    Code catégorie ! >
    Code catégorie
    Description !  
    Durée insc. !
    Age maximum !
    Age Minimum !
    Frais inscription !
    Dépassement
    Nb maxi emprunts ! >
    Frais réservation ! >
    ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 148,297 **** ! ! ! Valeurs enregistrées !
    method=post> !     ! ! TOTAL : :
    Code Catégorie ! ! >
    Code Catégorie
    Description !  
    Durée inscription !
    Age maxi !
    Age mini !
    Frais d'inscription !
    Avis de retard nécessaire
    Limite de prêt !
    Frais Réservation !
    ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Valeur supprimée !
    !     ! !

    Administration catégorie

    ! ! Rechercher sur ! ! !
    ! > ! !
    ! Code cat&éacute;gorie !
    Description
    Période inscription
    Age maximum
    Age minimum
    Profil
    ???
    Frais inscription
    DépassementOuiNon
    Nb maxi emprunts
    Frais réservation
    Valeur utilisée fois.Suppression impossible
    !
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    CatégorieDescriptionInscriptionAge maxiAge miniProfilDuréeFraisDepassnb max empruntfrais réserv
    OuiNon/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>//images/edittrash.png" border="0">
    !

    !

    ! ! --- 149,297 ---- ! ! ! Donnée enregistrée !
    method=post>
    ! ! ! TOTAL : :
    ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée effacée ! ! ! !

    Admin Catégorie

    ! ! Votre recherche sur ! ! ! ! > ! !
    ! Code Catégorie !
    Description
    Durée inscription
    Age maxi
    Age mini
    Saisir d'amende
    Frais d'inscription
    Avis de retard nécessaireOuiNon
    Limite de prêt
    Frais Réservation
    This record is used times. Deletion not possible
    !
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    CatégorieDescriptionDurée inscriptionFrais d'inscriptionAge maxiAge miniAmendeSignaler retardLimite de prêtRéserver
    ! Oui ! ! Non ! ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>//images/edittrash.png" border="0">
    !

    !

    ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** charges.tmpl 6 Oct 2003 13:40:49 -0000 1.1 --- charges.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,33 **** !

    ! Chaque zone doit être remplie avec : !

      !
    • Le montant de l'amende
      • !
    • Le retard toléré avant amende
      • !
    • La période de répétition de l'amende
      • !
    ! exemple : 1,7,7 1Euro d'amende après 7 jours, tous les 7 jours.

    !

    Note : Les amendes sont calculées par le script fines2.pl situé dans le répertoire misc. ! Demandez à votre administrateur de mettre ce script dans la crontab (après minuit) pour que les amendes soient calculées toutes les nuits.

    ! ! ! ! ! !
     
    ! "> ! " value="" size=6 maxlength=10>
    ! --- 1,27 ---- !

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours

    !

    Note : les amendes sont calculées par le misc/script fines2.pl. Demandez à votre administrateur de mettre ce script dans le crontab, après minuit, pour que les amendes soient calculées chaque nuit

    ! ! ! ! ! !
     
    ! "> ! " value="" size=6 maxlength=10>
    ! Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** checkmarc.tmpl 4 Sep 2003 15:03:00 -0000 1.3 --- checkmarc.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,128 **** ! ! /images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TestResult
    itemnum
  • Le champ "itemnum" DOIT être connecté à un champs MARC
    • !
  • Le sous champ correspondant DOIT être dans le "tab" -1 (ignore)
    		•
    OKitemnum : le champ est connecté et dans le tab -1 (ignore)
    champ itemTOUS les sous champs des exemplaires (items) DOIVENT :
    !
  • être reliés à 1 seul champ MARC (995 à priori pour l'UNIMARC),
    • !
  • et ils doivent être dans le "tab" 10 (items)
    		•
    OKTous les sous-champs des exemplaires (items) sont dans le même champ et dans le tab 10 (items)
    Table itemtypes videLa table itemtypes est vide. Elle doit contenir au moins 1 entrée
    OKla table itemtypes contient 1 entrée au moins
    itemtype NON connecté Le champ biblioitems.itemtype DOIT :
    !
  • être connecté à un sous-champ MARC
    • !
  • Le sous champ correspondant DOIT avoir authorised_value=itemtype
    		•
    OKbiblioitems.itemtype défini
    table branch est videLa table "branches" est vide. Elle doit contenir au moins 1 entrée
    OKLa table "branches" contient au moins 1 entrée
    branch NON connectéle champ Koha items.homebranch field DOIT :
    !
  • être connecté à un sous-champ MARC,
    • !
  • Le sous-champ correspondant DOIT avec authorised value=branch
    		•
    OKhomebranch défini
    holdingbranch NON connectéle champ Koha items.holdingbranch field DOIT :
    !
  • être connecté à un sous-champ MARC,
    • !
  • Le sous-champ correspondant DOIT avec authorised value=branch
    		•
    OKholdingbranch défini
    biblio et biblionumberLes champs Koha biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
    !
  • être reliés à un sous-champ MARC
    • !
  • être connectés au même champ marc(par exemple : 090$a et 090$b)
    • !
  • Etre dans le "tab" -1
    		•
    OKbiblionumber et biblioitemnumber correctement définis
    TOTALIl y a erreurs dans votre configuration MARC. corrigez les avant d'utiliser Koha !!!
     Configuration OK, pas d'erreur dans les paramètres MARC
    ! --- 1,129 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TestRésultat
    itemnum
  • Le champ itemnumb DOIT être connecté
    • !
  • Le sous-champ correspondant DOIT être dans l'onglet -1 (ignore)
    		•
    OKOuvrage : le champ itemnumber est connecté à un sous-champ dans un onglet -1
    champ ouvrageTOUS les champs ouvrage DOIVENT :
    !
  • être relié à la même étiquette,
    • !
  • et ils doivent tous être dans l'onglet 10 (items)
    		•
    OKLes étiquettes d'exemplaire sont dans le même champ MARC et dans le même onglet.
    table types d'ouvrage est videLa table types d'ouvrage est vide. Elle doit contenir au moins une valeur
    OKtable types d'ouvrage remplie avec au moins une valeur
    itemtype n'est PAS connecté Le champ biblioitems.itemtype DOIT :
    !
  • être relié à l'étiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autorisée=typeouvrage
    		•
    OKchamp biblioitems.itemtype défini
    Table Annexe videLa table Annexe est vide. Elle doit contenir au moins une valeur !
    OKtable Annexe remplie avec au moins une valeur
    Annexe propriétaire non reliéele champ items.homebranch DOIT :
    !
  • être relié à l'étiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autorisée=annexes
    		•
    OKAnnexe propriétaire définie
    Annexe dépositaire non reliéele champ items.holdingbranch DOIT :
    !
  • être relié à l'étiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autorisée=annexes
    		•
    OKAnnexe dépositaire définie
    notice bibliographique et n° biblioLes champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
    !
  • être relié à l'étiquette MARC,
    • !
  • être dans la MEME étiquette (par ex. : 090$a et 090$b)
    • !
  • être dans l'onglet -1 (items)
    		•
    OKn° biblio et n° d'ouvrage corrects
    TOTALVous avez erreurs dans votre configuration MARC. Corrigez-les avant d'utiliser Koha
     Configuration OK. Vous n'avez pas d'erreurs dans la table des paramètres MARC.
    ! Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** currency.tmpl 6 May 2003 14:56:40 -0000 1.1 --- currency.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! ! !

    Modifier monnaie

    ! !

    Ajout monnaie

    !     !
    ! ! --- 56,78 ---- ! !

    Modifier Monnaie

    ! !

    Ajouter une monnaie

    ! !
    Monnaie !
    Monnaie
    ! ! *************** *** 81,90 **** ! --- 81,90 ---- ! *************** *** 96,127 **** ! ! ! Donnée enregistrée !
    !     !
    Monnaie !
    Monnaie
    Taux !
    Taux !
    ! ! ! ! ! --- 96,127 ---- ! ! ! Donnée enregistrée ! ! !
    Monnaie
    Taux
    ! Cette donnée est utilisée fois. Suppression impossible
    ! ! ! ! ! *************** *** 129,138 **** ! --- 129,138 ---- ! *************** *** 140,173 **** !
    Monnaie
    Taux
    ! This record is used times. Deletion not possible
    !
    CONFIRMER SUPPRESSION !
    CONFIRMER SUPPRESSION
    ! !
    ! ! ! Donnée supprimée !
    !     ! !

    Monnaies

    !
    ! > !
    ! ! Rechercher sur : ! --- 140,173 ---- !
    ! !
    ! ! ! Donnée effacée !
    ! ! !

    Admin Monnaies

    !
    ! > !
    ! ! Votre recherche sur ! *************** *** 178,211 **** ! ! ! ! ! ! !
    EditerSupprimer
    !
    ! ! << Prec !        ! ! Suiv >> !
    !
    !     ! --- 178,211 ---- ! ! ! ! ! Editer ! Supprimer ! !
    ! ! << Prev !        ! ! Suivant >> !
    !
    ! ! Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** itemtypes.tmpl 6 Nov 2003 10:18:34 -0000 1.2 --- itemtypes.tmpl 11 Feb 2004 08:59:50 -0000 1.3 *************** *** 1,3 **** ! ! ! !

    Modifier le type d'exemplaire

    ! !

    Ajouter le type d'exemplaire

    !     !
    ! ! ! ! ! ! ! ! ! ! ! ! --- 60,107 ---- } ! ! !

    Modifier categ. ouvrage

    ! !

    Ajouter catégorie d'ouvrage

    ! !
    Type exemplaire>
    Type exemplaire
    Description 
    Durée d'emprunt
    Renouvellement autorisécoché value=1>
    Coût emprunt
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 97,150 ****
    Catég ouvrage>
    Catég ouvrage
    Description 
    Non empruntable ! ! ! ! ! ! Si coché, aucun ouvrage de ce type ne peut être emprunté. Sinon, les ouvrages peuvent être empruntés sauf si le champ "notforloan" de l'ouvrage est coché. !
    Durée de prêt ! ! Utilisé seulement si "Non empruntable" n'est pas coché. !
    Renouvellements autoriséschecked value=1>
    Coût du prêt
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type exemplaire
    Description
    Durée emprunt
    RenouvellementAutoriséPas autorisé
    Coût emprunt
    Cette donnée est utilisée fois. Suppression impossible
    CONFIRMER SUPPRESSION
    !     ! !

    Administration type exemplaire

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code ! DescriptionDurée empruntRenouvelableCoûtModifierSupprimer
    YesNo?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

    --- 111,164 ----
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catég ouvrage
    Description
    Durée de prêt
    RenouvellementsAllowedNot allowed
    Coût du prêt
    This record is used times. Deletion not possible
    CONFIRMER SUPPRESSION
    ! ! !

    Admin Categ ouvrage

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code ! DescriptionDurée de prêtRenouvelableFraisEditerSupprimer
    OuiNon?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

    *************** *** 152,162 **** ! ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    !     ! --- 166,176 ---- ! ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/koha2marclinks.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** koha2marclinks.tmpl 14 Oct 2003 09:45:29 -0000 1.3 --- koha2marclinks.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,16 **** ! ! !

    !

    Choisir et valider 1 parmi les suivants :.

    !
    ! "> ! "> ! --- 1,16 ---- ! ! !

    !

    Choisir et valider une des suivantes pour .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! "> ! "> ! *************** *** 20,29 ****
    ! "> ! "> ! --- 20,29 ----
    ! "> ! "> ! *************** *** 33,42 ****
    ! "> ! "> ! --- 33,42 ----
    ! "> ! "> ! *************** *** 46,55 ****
    ! "> ! "> ! --- 46,55 ----
    ! "> ! "> ! *************** *** 59,68 ****
    ! "> ! "> ! --- 59,68 ----
    ! "> ! "> ! *************** *** 72,81 ****
    ! "> ! "> ! --- 72,81 ----
    ! "> ! "> ! *************** *** 85,94 ****
    ! "> ! "> ! --- 85,94 ----
    ! "> ! "> ! *************** *** 98,107 ****
    ! "> ! "> ! --- 98,107 ----
    ! "> ! "> ! *************** *** 111,120 ****
    ! "> ! "> ! --- 111,120 ----
    ! "> ! "> ! *************** *** 124,133 ****
    ! "> ! "> ! --- 124,133 ----
    ! "> ! "> ! *************** *** 138,183 ****
    !

    Pour déconnecter cliquer ==>

    		 ! ! "> ! "> !
    ! ! ! Liens MARC !

    NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez à votre administrateur d'exécuter le script misc/rebuildnonmarc.pl

    !
    ! ! ! ! ! ! ! ! ! ! ! !
    Champ Koha ?ChampSous-champLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    !
    ! --- 138,183 ----
    !

    Pour "déconnecter" cliquer ==>

    		 !
    ! "> ! "> !
    ! ! ! Liens MARC !

    Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl.

    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    champ Koha ?EtiquetteSous-champLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** marc_subfields_structure.tmpl 4 Jul 2003 14:04:02 -0000 1.3 --- marc_subfields_structure.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,129 **** ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Champliblibrarian / libopacIncrementationObligatoireChamp KohaBaliseValeur authorisée ou catégorie de thésaurus
    -
    !
    ! ou
    ! ou
    ! !

    Remarque : dans la dernière colonne vous avez le choix entre : !

      !
    • Une "valeur authorisée": qui se réfère ! à une liste de valeurs authorisées pour ce sous champ. Voir ! le tableau correspondant (admin table)
      • !
    • Une "catégorie thesaurus". Voir le tableau correspondant ! (admin table)
      • !
    • Un "créateur de valeurs" : les créateurs de valeurs ! sont des programmes Perl qui vous aident à sélectionner la ! valeur d'un champ. Ils sont dépendants de MARC et remplissent parfois ! automatiquement un autre sous champ.
      • !
    !

    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Données effacées !
    !
    /images/background-mem.gif">Sous champ/images/background-mem.gif">
     
    CONFIRMEZ LA SUPPRESSION
    ! !
    "> ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" width=5%>Sous-champ/images/background-mem.gif" width=30%>Libellé/images/background-mem.gif" width=10%>champ koha ?/images/background-mem.gif" width=8%>Rep ?/images/background-mem.gif" width=8%>Oblig ?/images/background-mem.gif" width=8%>Onglet ?/images/background-mem.gif" width=8%>Val. autorisée ?/images/background-mem.gif" width=8%>Thesaurus ?/images/background-mem.gif" width=8%>Plug-in ?/images/background-mem.gif" width=8%> 
    OuiNonOuiNon">//images/edittrash.png" border="0">
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    !     ! --- 1,112 ---- ! ! ! ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ChampLibellé OPACRepetobligatoirechamp KohaOngletValeur autorisée ou
    ! Catégorie thésaurus
    - " size=40 maxlength=80>
    ! " size=40 maxlength=80>
    ! ou
    ! ou
    !

    Note: dans la dernière colonne, vous pouvez choisir: !

    • Une "valeur autorisée": se réfère à une liste de valeurs autorisées pour ce sous-champs. Voir la table admin correspondante..
      • !
    • Une "catégorie thésaurus": se réfère à une catégorie du thésaurus. Voir la table admin correspondante..
      • !
    • Un "constructeur de valeur": les constructeurs de valeurs sont des programmes Perl qui vous aide à sélectionner les entrées d'un champ selon une syntaxe MARC. Ils remplissent aussi parfois automatiquement des sous-champs..
      • !
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée effacée ! /images/background-mem.gif" width=5%>Sous-champ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sous-champ
     
    CONFIRMER SUPPRESSION
    ">
    Libchamp Koha ?Rep ?obligatoire ?Onglet ?Valeur autorisée ?Thésaurus ?Val build ?Supprimer
    OuiNonOuiNon">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.7 --- marctagstructure.tmpl 11 Feb 2004 08:59:50 -0000 1.8 *************** *** 1,4 **** ! ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Champs
    Liblibrarian
    Libopac
    Incrementation
    Obligatoire
    Valeur autorisée (si vous sélectionnez une ! valeur ici, les indicateurs seront limités à la seule liste ! de valeurs autorisées)
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! Données effacées !
    !     ! ! Gestion de la structure de balisage MARC !

    NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez à votre administrateur d'exécuter le script misc/rebuildnonmarc.pl

    !
    ! ! !
    /images/background-mem.gif">Balise/images/background-mem.gif">
     
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! -
    /images/background-mem.gif" width="5%">Balise/images/background-mem.gif" width="45%">Libellé/images/background-mem.gif" width="5%">Répétable/images/background-mem.gif" width="5%">Obligatoire/images/background-mem.gif" width="10%">Valeurs
    		/images/background-mem.gif" width="16%">Sous champs/images/background-mem.gif" width="7%"> /images/background-mem.gif" width="7%"> 
    OUINONOUINON">Sous champs">//images/fileopen.png" border="0" height="25">">//images/edittrash.png" border="0" height="25">
    -
    - - - - - -
    ! //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    !     ! ! --- 52,152 ---- ! !

    !
    ! ! ! ! ! !
    Etiquette
    Libellé bibliothécaire
    Lib pour l'opac
    Répétable
    Obligatoire
    Valeur autorisée (Si vous sélectionnez une valeur ici, les indicateurs seront limités une liste de valeurs autorisées)
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée effacée ! ! ! !

    Admin Structure étiquette MARC

    ! Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl. ! ! ! !
    /images/background-mem.gif">etiquette/images/background-mem.gif">
     
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Etiquette/images/background-mem.gif">Lib/images/background-mem.gif">Répétable/images/background-mem.gif">Obligatoire/images/background-mem.gif">Autorisé
    valeur    		/images/background-mem.gif">Sous-champs/images/background-mem.gif">Editer/images/background-mem.gif">Supprimer
    OuiNonOuiNon">subfields">//images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">//images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    + +
    ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! ! Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** printers.tmpl 6 May 2003 14:56:40 -0000 1.1 --- printers.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! !

    Modifier imprimante

    ! !

    Ajout imprimante

    !     !
    --- 56,66 ---- !

    Modifier imprimante

    ! !

    Ajouter une imprimante

    ! ! *************** *** 68,94 **** ! ! ! ! ! ! ! ! --- 68,94 ----
    Nom imprimante !
    Nom imprimante
    Queue
    Type
    ! ! ! ! ! ! ! ! *************** *** 99,129 **** ! ! ! Donnée enregistrée !
    !     !
    Nom Imprimante !
    Nom Imprimante
    Queue
    Saisir
    ! ! ! ! ! ! --- 99,129 ---- ! ! ! Donnée enregistrée ! ! !
    Imprimante
    Queue
    Type
    ! ! ! ! ! ! *************** *** 132,140 ****
    Imprimante
    Queue
    Saisir
    ! !
    --- 132,140 ----
    ! !
    *************** *** 142,164 ****
    ! ! ! Donnée supprimée !
    !     ! !

    Imprimantes

    ! > !
    ! ! Rechercher sur : ! --- 142,164 ----
    ! ! ! Donnée effacée !
    ! ! !

    Admin Imprimante

    ! > !
    ! ! Votre recherche sur ! *************** *** 166,203 **** ! ! ! ! ! ! ! ! !
    Nom QueueType
    EditDelete
    !
    ! ! << Prec ! ! ! ! ! Suiv >> !
    !
    !     ! --- 166,204 ---- Nom Queue ! Saisir ! ! ! ! ! ! Editer ! Supprimer ! !
    ! ! << Prev ! ! !        ! ! ! Suivant >> !
    !
    ! ! Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** stopwords.tmpl 24 Nov 2003 17:00:09 -0000 1.2 --- stopwords.tmpl 11 Feb 2004 08:59:50 -0000 1.3 *************** *** 1,5 **** ! ! ! !

    Modifier mot vide

    ! !

    Ajouter mot vide

    !     !
    ! ! ! ! ! ! --- 53,81 ---- ! !

    Modifier un mot

    ! !

    Ajouter un mot

    ! !
    Mot vide !
    Mot vide
    ! ! ! ! ! ! *************** *** 84,106 ****
    Mot !
    Mot
    !     ! ! Mot vide enregistré !
    !     ! ! ! ! ! --- 84,106 ----
    Mot vide
    ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! *************** *** 109,117 ****
    Mot
    ! !
    --- 109,117 ----
    ! !
    *************** *** 119,173 ****
    !     ! ! Donnée supprimée !
    !     ! !

    Mots vides

    ! NOTE : Si vous modifiez cette table, demandez à votre administrateur système d'exécuter le script misc/rebuildnonmarc.pl !
    ! > !
    ! ! Rechercher sur ! ! ! ! ! ! ! !
    Mot vide
    Delete
    !
    ! ! << Prec ! ! ! ! Suiv >> !
    !
    !     ! --- 119,175 ---- ! ! ! Donnée effacée !
    ! ! !

    Admin Mots vide

    ! Note : si vous changez quelque chose dans cette table, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl. !
    ! > !
    ! ! Votre recherche sur ! ! ! ! ! ! ! !
    Mot
    Supprimer
    !
    ! ! << Prev ! ! !        ! ! ! Suivant >> !
    !
    ! ! Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** systempreferences.tmpl 19 May 2003 13:53:46 -0000 1.3 --- systempreferences.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,3 **** ! ! ! ! !

    Modifier préférence système

    ! !

    Ajouter préférence système

    !     !
    ! ! ! ! ! !
    Variable
    Variable
    Value
    Explanation
     
    !     ! ! Donnée enregistrée !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée supprimée !
    !     ! ! ! Administration des préférences systèmes
    ! !
    /images/background-mem.gif">Variable/images/background-mem.gif">
    Value
    Confirmez la suppression
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Paramètre/images/background-mem.gif">Valeur/images/background-mem.gif">Explication/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    - - ! !
    -
    //images/filenew.png" border="0">
    -     ! --- 55,153 ---- ! ! ! !

    Modifier une préférence système

    ! !

    Ajouter une préférence système

    ! !
    ! ! ! ! ! !
    Variable
    Variable
    Valeur">
    Explication">
     
    ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! ! ! ! ! !
    Variable
    Valeur
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! Donnée effacée !
    ! ! ! !

    Admin Préférences système

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    VariableValeurExplication  
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>Editer">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>Supprimer
    ! !
    !
    method=post> ! ! !
    ! ! ! ! ! Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** thesaurus.tmpl 10 Jul 2003 14:11:46 -0000 1.5 --- thesaurus.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,161 **** ! ! ! Gestion du thesaurus
    ! !
    /images/background-mem.gif">Valeurs relatives à ! ()


    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Autres formes/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    !
    ! "> ! "> !
    //images/filenew.png" border="0">
    !
    ! !

    ModificationAjout

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catégorie
    Forme d'autorité" >" maxlength="80" size="80">
    Autre forme
     "> ! "> ! "> ! "> ! "> ! ">
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! !
    /images/background-mem.gif">lib/images/background-mem.gif">
    Valeur
    CONFIRMEZ LA SUPPRESSION de cet enregistrement ! et de tous les enregistrements dépendant de celui-ci
    ! ! !
    ! !
    !     ! ! Gestion du thesaurus !

    Gère le thésaurus et les listes d'autorité.
    !

      ! Creuser : voir les données dépendantes de celle-ci
      ! Formes exclues : voir d'autres formes de ce terme d'autorité

      !
    !
    ! ! "> ! ! Nouvelle catégorie... ! ! ! &rechercher catégorie=">
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" width="5%"> /images/background-mem.gif">Forme libre/images/background-mem.gif">Autorité/images/background-mem.gif" width="8%">Creuser/images/background-mem.gif" width="8%">Exclues/images/background-mem.gif" width="8%"> /images/background-mem.gif" width="8%"> 
      CreuserExclues">//images/fileopen.png" border="0" height="25">">//images/edittrash.png" border="0" height="25">
    ! ! ! ! !
    !
    ! ! "> ! "> ! "> !
    //images/filenew.png" border="0">
    ! !
    ! ! --- 1,155 ---- ! ! ! Gestion du thésaurus
    ! !
    En liaison avec ()


    ! ! ! ! ! ! ! ! ! ! ! !
    autres formulaires  
    ">Editer">Supprimer
    ! ! "> ! "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Add" BORDER=0 >
    ! ! ! !

    ModifierAjouter

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catégorie
    Libellé autorité" >" maxlength="80" size="80">
    Autre forme" maxlength="80" size="80">
     "> ! "> ! "> ! "> ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! !
    lib
    Valeur
    !
    ! ! ! "> !
    CONFIRMER SUPPRESSION de cette entrée et toutes les entrées dépendantes de celle-ci
    ! ! !

    Gestion du thésaurus

    !

    Gestion du thésaurus et des fichiers autorités.
    !

      ! Extraire: Voir les formes associées
      ! Lié: Voir les formes rejetées

      !
    !
    ! ! "> ! ! Nouvelle catégorie... !
    ! ! &search_category=">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     Formulaire libreAutoritéExtraireLiéEditerSupprimer
      Extraire  Lié">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !
    ! ! ! ! ! !
    " class="button">Previous" class="button"> Next
    !
    ! ! ! "> ! "> ! "> !

    ! ! ! ! ! Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** z3950servers.tmpl 6 May 2003 14:56:40 -0000 1.1 --- z3950servers.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! ! !

    ModifierServeur Z39.50

    ! !

    Ajouter Serveur Z39.50

    !     !
    ! ! ! ! ! --- 71,104 ---- ! !

    Modifier serveur Z39.50

    ! !

    Ajouter un serveur Z39.50

    ! !
    Serveur Z39.50 !
    Server Z39.50
    Hostname !
    ! ! ! ! ! *************** *** 106,145 **** ! ! ! ! ! ! ! ! ! ! ! !
    Serveur Z39.50 !
    Serveur Z39.50
    Nom de l'hébergeur !
    Port !
    Database !
    Userid !
    Password !
    Actif !
    Priorité (d'affichage) !
    Syntaxe (les serveurs renvoient les données dans des formats variables. En choisir un) --- 106,145 ---- Port !
    Base de données !
    Identifiant utilisateur !
    Mot de passe !
    Coché (recherche par défaut) !
    Rang (ordre d'affichage) !
    Syntaxe (Z39.50 peut envoyer des notices en différents formats. Sélectionnez lequel) *************** *** 154,208 ****
    !     ! ! Donnée enregistrée !
    !     ! ! ! ! ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! --- 154,208 ----
    Site !
    Hostname
    Port
    Database
    Userid
    Password
    Checked
    Rank
    ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 210,288 **** ! !
    Site !
    Nom de l'hébergeur
    Port
    Base de données
    Identifiant utilisateur
    Mot de passe
    Vérifié
    Rang
    !     ! ! Donnée supprimée !
    !     ! !

    Serveurs z3950

    !
    ! > !
    ! ! Rechercher sur ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SiteHostnamePortDatabaseUseridPasswordCheckedRankSyntax
    //images/fileopen.png" ALT="Edit" title="edit" BORDER=0 >//images/edittrash.png" ALT="Delete" title="delete" BORDER=0 >
    !
    ! ! << Prec !        ! ! suiv >> !
    !
    !     ! --- 210,288 ---- ! !
    ! ! ! Donnée effacée !
    ! ! !

    Admin Serveurs Z39.50

    !
    ! > !
    ! ! Votre recherche sur ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SiteNom de l'hébergeurPortBase de donnéesIdentifiant utilisateurMot de passeVérifiéRangSyntaxe
    //images/fileopen.png" ALT="Edit" title="éditer" BORDER=0 >//images/edittrash.png" ALT="Delete" title="supprimer" BORDER=0 >
    !
    ! ! << Prev !        ! ! Suivant >> !
    !
    ! ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:23 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ selectbranchprinter.tmpl,1.1,1.2 branchtransfers.tmpl,1.4,1.5 circulation.tmpl,1.8,1.9 returns.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/circ Modified Files: branchtransfers.tmpl circulation.tmpl returns.tmpl Added Files: selectbranchprinter.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** branchtransfers.tmpl 22 Sep 2003 13:05:17 -0000 1.4 --- branchtransfers.tmpl 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 1,75 **** !
    ! Prêt   ! Retours
    !

    Circulation: Transferts

    ! Annexe :
    ! Imprimante : Modifier ! > ! >

    ! ! ! > ! > !

    ! !

    /images/background-mem.gif">Réservation
    ! Reservé : Réservation trouvée pour (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Exemplaire en attente :
    ! L'exemplaire est marqué en attente à pour (" onClick="openWindow(this,'Member', 480, 640); return false;">).
     ! ! --- 1,78 ---- !
    ! Marquer reservation et transférer exemplaire à : ! Supprimer réservation et transférer :
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    supprimer réservation et transférer:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignorer et retourner au transfert:
    ! > ! ! value=> ! value=> ! value=> ! !
    ! ! Emprunteur suivant ! ! Retours
    !

    Circulation: Transferts


    ! Annexe:   ! Imprimante:
    ! Changer Paramètres ! > ! >

    ! !
    /images/background-mem.gif">Réservation trouvée
    ! Réservé: Réservation trouvée pour (" onClick="openWindow(this,'Lecteur', 480, 640); return false;">). ! Ouvrage marqué en attente:
    ! Ouvrage est marqué en attente à for (" onClick="openWindow(this,'Lecteur', 480, 640); return false;">).
    ! ! *************** *** 77,159 ****
    ! Changer Réserver en "en attente" et transférer le livre vers : ! Annuler réservation et tenter un transfert:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Annuler réservation et tenter un transfert:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignorer et retourner aux transferts:
    ! > ! ! value=> ! value=> ! value=> ! !
    ! !
    /images/background-mem.gif">Messages
    ! ! Réservation annulée
    !     ! ! Exemplaire marqué en attente au site :
    !     !     ! ! ! Pas d'exemplaire avec le code barre : ! ! ! Renvoyer exemplaire à son propriétaire : ! ! ! L'exemplaire est déjà noté arrivé. ! ! ! Exemplaire emprunté par " ! onClick="openWindow(this,'Member', 480, 640); return false;"> ! et rendu !
    !
    ! /images/holder.gif" width=24 height=24>
    ! !
    /images/background-mem.gif"> ! Selectionner site
    Site destination :
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Code barre de l'exemplaire
    Code barre exemplaire:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Exemplaires transférés
    Code barreTitreAuteurTypedeà
    align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center> align=center> align=center>
    ! ! ! --- 80,162 ----

    ! !
    /images/background-mem.gif">Messages
    ! ! Réservation annulée
    ! ! ! Ouvrage doit être en attente à l'annexe:
    ! ! ! ! ! No Ouvrage with barcode: ! ! ! Please return item to home branch: ! ! ! Ouvrage is already at destination branch. ! ! ! Ouvrage was on loan to " ! onClick="openWindow(this,'Lecteur', 480, 640); return false;"> ! et a été retourné. !
    !
    ! /images/holder.gif" width=24 height=24>

    ! !
    /images/background-mem.gif"> ! Sélectionner une annexe
    Annexe de destination:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Entrer Code barre du livre
    Code barre d'un ouvrage:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Ouvrages transférés
    Code barreTitreAuteurSaisirDeà
    > ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">>> >>>
    ! ! ! Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** circulation.tmpl 29 Oct 2003 23:38:05 -0000 1.8 --- circulation.tmpl 11 Feb 2004 09:00:21 -0000 1.9 *************** *** 1,33 **** ! ! !
    ! &branch=&printer=&print=yes> ! Suivant  ! Retours  ! Transferts
    !

    Circulation: Retours


    ! Annexe:
    ! Imprimante:
    ! Modification paramètres
    ! > ! > !

    ! ! !

    ! Retours   ! Transferts --- 1,30 ---- ! ! !
    ! &printer=&print=oui"> ! Emprunteur suivant  ! Retours  ! Transferts
    !

    Circulation: Prêts

    ! Annexe: Imprimante: Changer Paramètres ! "> ! "> ! !
    ! Retours   ! Transferts *************** *** 35,61 ****
    !

    Circulation: Emprunts

    ! Annexe :
    ! Imprimante : Modifier
    !
    /images/background-mem.gif"> ! Question
    ! --- 32,59 ----
    ! Demande d'emprunt de ! par to . !

    !

    Circulation: Prêts


    ! Annexe:
    ! Imprimante:
    ! Changer Paramètres ! "> ! "> !

     

    ! ! ! ! ! ! --- 28,58 ---- ! ! *************** *** 61,68 **** ! ! --- 61,68 ---- ! ! Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parameters-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- parameters-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** parameters-top.inc 7 Aug 2003 14:19:55 -0000 1.10 --- parameters-top.inc 11 Feb 2004 09:00:20 -0000 1.11 *************** *** 3,8 **** ! KOHA: INTRANET: Parameters ! /includes/common-style.css"> ! KOHA: INTRANET: Paramètres ! /includes/common-style.css">
    /images/background-mem.gif"> ! Question sur le prêt
    ! *************** *** 64,104 **** !
    ! Attempting to issue ! by to . !

    ! --- 62,102 ---- ! ! ! !
    !
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    		!
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    ! *************** *** 109,218 ****
    !
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    		!
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    ! !
    Erreur emprunt

    ! ! ! ! !
    /images/background-mem.gif">Messages
    !     ! !
    ! > ! > ! ! !
    /images/background-mem.gif"> ! Selectionner lecteur
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! entrer un numéro de carte lecteur
    ou une partie de son nom
    ! ! > ! >
    !     !
    ! *************** *** 176,182 ****
    !
    ! ! ! ! !
    ! ! ! --- 107,216 ----
    /images/background-mem.gif"> ! Code barre exemplaire
    ! ! ! ! !
    code barre :
    !
    ! ! !
    ! > Fixer date retour
    ! > ! > ! > ! ! ! ! > !
    ! !
    Erreur prêt d'un livre

    ! ! ! ! !
    /images/background-mem.gif">Messages
    ! ! ! ! "> ! "> ! ! !
    /images/background-mem.gif"> ! Sélectionner un emprunteur
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Entrer N° carte de lecteur
    ou partie du nom
    ! ! "> ! ">
    ! ! !
    !
    ! !
    ! ! ! *************** *** 224,311 ****
    /images/background-mem.gif"> ! Entrer Code barre du livre
    ! ! ! ! !
    Code barre d'un ouvrage:
    !
    ! ! !
    ! > Sticky Date de retour
    ! "> ! "> ! "> ! ! ! ! "> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Informations lecteur
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Catégorie:
    Frais> onClick=\"openWindow(this, 'Payment', 480,640)\">Paiement
    Frais onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    En attente ! ! &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
    !
    RetardsOui, voir ci-dessous
    Notes
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Emprunts du jour
    Retour pour leCode barreTitreAuteurClasse
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Autres emprunts
    Retour pour leCode barreTitreAuteurClasse
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     - --- 222,318 ----

    		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Informations emprunteur
    ! " onClick="openWindow(this,'Lecteur', 480, 640)"> ! !
    Category:
    GNA>Emprunteur is gone with no address
    PERDU>Emprunteur's card is lost
    DBARRED>Emprunteur is debarred
    FRAIS>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    FRAIS" onClick="openWindow(this, 'Payment', 480,640)">Payment
    EN ATTENTE ! ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640)"> ()
    !
    RETARDSOui, voir plus bas
    NOTES
    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Prêts d'aujourd'hui
    Date de retourCode barreTitreAuteurCatégorie
    >> ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">">">">
    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Prêts précédents
    Date de retourCode barreTitreAuteurCatégorie
    ">"> ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">">">">
    ! ! Index: returns.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** returns.tmpl 22 Sep 2003 13:05:17 -0000 1.4 --- returns.tmpl 11 Feb 2004 09:00:21 -0000 1.5 *************** *** 1,94 **** !
    ! Prêts !  Transfers
    !

    Circulation: Retours

    ! Annexe :
    ! Imprimante : Modifier ! > ! >

    ! --- 1,97 ---- !
    !
    /images/background-mem.gif">Réservations trouvées
    ! ! Exemplaires en attente :
    ! L'exemplaire ()
    ! est en attente à pour (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
    ! ! value=> ! value=> ! value=> !
    !     ! ! Item marked Waiting:
    ! L'exemplaire : ()
    ! doit être transféré à
    ! pour être emprunté par (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
    ! ! ! value=> ! value=> ! value=> ! !
    !     ! ! Reservation trouvée : Exemplaire : () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
    ! pour (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false">) Pour être ramassé à . !
    Modifier statut ("attente") et imprimer déplacer?:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! Exemplaire réservé : () ! Code barre : ! Type : ! Provenant de : ! ! Emprunté par : ! ! carte N°: ! Tel : ! ! ! ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "> !
    !
    ! ! Prêts  ! ! Transferts
    !

    Circulation: Retours


    ! Annexe:   ! Imprimante:
    ! Changer Paramètres ! > ! >

    ! *************** *** 96,151 **** ! !
    !
    /images/background-mem.gif">Réservation trouvée
    ! ! Ouvrage marqué en attente:
    ! Ouvrage ()
    ! est marqué en attente à for (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false;">).
    ! ! value=> ! value=> ! value=> !
    ! ! ! Ouvrage marqué en attente:
    ! Ouvrage: ()
    ! doit être transféré vers
    ! pour être retiré à (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false;">).
    ! ! ! value=> ! value=> ! value=> ! !
    ! ! ! Réservation trouvée: Ouvrage: () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;">
    ! for (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false">) to be collected at . !
    Mettre le statut "Attente" et imprimerslip?:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ITEM RESERVED: () ! barcode: ! itemtype: ! COLLECT AT: ! ! BORROWER: ! ! card number: ! Téléphone: ! ! ! ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "> !
    !
    !
    ! !
    /images/background-mem.gif"> ! code barre exemplaire
    code barre :
    ! ! value=> ! value=> ! value=> !
    		! !
    /images/background-mem.gif">Messages
    ! ! ! code barre inconnu: ! ! ! Retourner à ! ! ! Pas emprunté. ! ! ! Exemplaire perdu. Marqué retrouvé. ! ! ! Exemplaire éliminé !
    !
    !
    /images/background-mem.gif"> ! Retour d'exemplaire
    ! Titre:
    --- 99,154 ----
    !
    ! !
    /images/background-mem.gif"> ! Entrer Code barre du livre
    Code barre d'un ouvrage:
    ! ! value=> ! value=> ! value=> !
    		! !
    /images/background-mem.gif">Messages
    ! ! ! No Ouvrage with barcode: ! ! ! Please return to ! ! ! Not On Prêt. ! ! ! Ouvrage was lost, now found. ! ! ! Ouvrage Annulé !
    !
    !
    /images/background-mem.gif"> ! Information sur un ouvrage retrouvée
    ! Titre:
    *************** *** 153,237 ****     		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Information emprunteur
    ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ! ,
    /images/background-mem.gif" colspan=2> ! indicateurs
    >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Paiement
    > ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Item'); return false;">()
    !
    > ! ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;"> ! !
    !
    >
    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Exemplaires rendus
    Retour pour leCode barreTitreAuteurTypeEmprunteur
    > ! ! ! ! // ! ! ! ! Non emprunté ! > align=center> ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">>> align=center>> ! ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ! ! ! ! !
    ! --- 156,240 ----     		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Informations Emprunteur
    ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Lecteur'); return false;"> ! ,
    /images/background-mem.gif" colspan=2> ! Drapeaux
    >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Payment
    > ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Ouvrage'); return false;">()
    !
    > ! ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;"> ! !
    !
    >
    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Ouvrages rendus
    Date de retourCode barreTitreAuteurSaisirEmprunteur
    > ! ! ! ! // ! ! ! ! Pas en prêt. ! >> ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;">>>>> ! ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Lecteur'); return false;"> ! ! ! ! !
    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes about-bottom.inc,1.2,1.3 about-top.inc,1.3,1.4 acquisitions-bottom.inc,1.4,1.5 acquisitions-top.inc,1.8,1.9 cat-bottom.inc,1.4,1.5 cat-top.inc,1.12,1.13 circulation-bottom.inc,1.4,1.5 circulation-top.inc,1.11,1.12 common-style.css,1.4,1.5 issues-bottom.inc,1.4,1.5 issues-top.inc,1.3,1.4 members-bottom.inc,1.4,1.5 members-top.inc,1.10,1.11 opac-bottom.inc,1.3,1.4 opac-top.inc,1.3,1.4 parameters-bottom.inc,1.4,1.5 parameters-top.inc,1.10,1.11 reports-bottom.inc,1.4,1.5 reports-top.inc,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/includes Modified Files: about-bottom.inc about-top.inc acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-top.inc circulation-bottom.inc circulation-top.inc common-style.css issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc opac-bottom.inc opac-top.inc parameters-bottom.inc parameters-top.inc reports-bottom.inc reports-top.inc Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** about-bottom.inc 18 Sep 2003 12:32:40 -0000 1.2 --- about-bottom.inc 11 Feb 2004 09:00:20 -0000 1.3 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** about-top.inc 5 Jun 2003 12:40:49 -0000 1.3 --- about-top.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 3,11 **** ! KOHA: INTRANET: Parameters ! /includes/common-style.css"> ! --- 3,11 ---- ! KOHA: INTRANET: Paramètres ! /includes/common-style.css"> ! *************** *** 33,37 ****
    !
    --- 33,37 ----
    !
    *************** *** 50,54 **** ! Acquisition --- 50,54 ---- ! Acquisitions *************** *** 56,63 **** ! Etats ! Paramètres --- 56,63 ---- ! Rapports ! Paramètres *************** *** 72,78 ****
    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    !     --- 72,78 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** acquisitions-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- acquisitions-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 1,18 **** - -

     

    Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide
    --- 1,19 ----

     

    + +
    Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help
    *************** *** 20,22 **** - --- 21,22 ---- Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** acquisitions-top.inc 5 Jun 2003 12:40:49 -0000 1.8 --- acquisitions-top.inc 11 Feb 2004 09:00:20 -0000 1.9 *************** *** 4,8 **** KOHA: INTRANET: Acquisitions ! /includes/common-style.css"> KOHA: INTRANET: Acquisitions ! /includes/common-style.css">     		! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 70,76 ****

    ! !

    Connecté en tant que : [Quitter]

    ! !

    Se connecter à Koha

    !     --- 70,76 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** cat-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- cat-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** cat-top.inc 7 Aug 2003 14:19:55 -0000 1.12 --- cat-top.inc 11 Feb 2004 09:00:20 -0000 1.13 *************** *** 14,18 **** ! /includes/common-style.css"> !
    ! --- 60,83 ----
    --- 25,35 ---- font-weight: bold; } !
    ! !
    *************** *** 151,155 **** ! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 157,164 **** ! Marc ! ! Etats --- 54,58 ---- ! Rapports *************** *** 166,174 **** ! A propos
    		! A propos
    + + + + + + + + +
    options >>   + Adresse Lecteur + + Ajouter un lecteur + + Ajouter une organisation +
    ! !

    Connecté en tant que : [Log Out]

    ! !

    Se connecter à Koha

    !     --- 85,91 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: opac-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-bottom.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-bottom.inc 18 Sep 2003 12:32:40 -0000 1.3 --- opac-bottom.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 7,12 **** ! Recherche || ! Zone Lecteur || Accueil --- 7,13 ---- ! Recherche Catalogue || ! ! S'inscrire || Accueil Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-top.inc 5 May 2003 15:00:54 -0000 1.3 --- opac-top.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 4,8 **** ! KOHA: OPAC Catalogue Search --- 4,8 ---- ! KOHA: OPAC Recherche Catalogue *************** *** 28,58 ****
    KOHA: Catalogue SearchSearch ! ! My Settings ! ! Join ! Home
    /images/inside-top-search.gif" ! width=349 height=50 alt="KOHA: Recherche Catalogue" hspace=0 vspace=0 border=0>/images/mouseover-search.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-search.gif" ! width=71 height=30 alt="Chercher" hspace=0 vspace=0 border=0 name="menu-search"> ! /images/mouseover-mysettings.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'"> ! /images/menu-mysettings.gif" width=90 height=30 alt="My Settings" hspace=0 vspace=0 border=0 name="menu-mysettings"> ! /images/mouseover-join.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'"> ! /images/menu-join.gif" width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"> ! /images/mouseover-home.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-home.gif" ! width=60 height=30 alt="Accueil" hspace=0 vspace=0 border=0 name="menu-home">
    KOHA
    /images/inside-koha-bottom.gif" width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 >/images/holder.gif" width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" > !
    --- 31,35 ----
    !
    *************** *** 48,52 **** ! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 73,77 **** ! Valeurs auth --- 73,77 ---- ! Valeur autorisée *************** *** 91,97 ****
    ! !

    Connecté en tant que: [Déconnecter]

    ! !

    Se connecter à Koha

    !     --- 91,97 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** reports-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- reports-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** reports-top.inc 5 Jun 2003 12:40:49 -0000 1.9 --- reports-top.inc 11 Feb 2004 09:00:20 -0000 1.10 *************** *** 3,8 **** ! KOHA: INTRANET: Reports ! /includes/common-style.css"> ! KOHA: INTRANET: Rapports ! /includes/common-style.css">
    		! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 70,76 ****
    ! !

    Connecté en tant que: [Déconnecter]

    ! !

    Se connecter à Koha

    !     --- 70,76 ----

    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio-nomarc.tmpl,1.1,1.2 additem-nomarc.tmpl,1.1,1.2 marcimport.tmpl,1.2,1.3 addbiblio.tmpl,1.10,1.11 addbooks.tmpl,1.3,1.4 isbnsearch.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: addbiblio.tmpl addbooks.tmpl isbnsearch.tmpl Added Files: addbiblio-nomarc.tmpl additem-nomarc.tmpl marcimport.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** addbiblio.tmpl 24 Nov 2003 16:28:49 -0000 1.10 --- addbiblio.tmpl 11 Feb 2004 09:00:21 -0000 1.11 *************** *** 1,15 **** ! !
    ! /images/background-mem.gif"> ! --- 1,15 ---- ! !
    Notice MARC :
    ! /images/background-mem.gif"> ! *************** *** 17,35 ****
    Notice biblio MARC :
    ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 ! "> ! ! recherche z3950
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 40,63 ****
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 ! "> ! ! ! ! ! ! Recherche Z39.50
    ! ! ! /images/background-mem.gif"> ! ! ! !
    ">"> - )">+
      * ! ! "> ! "> ! "> ! "> ! ">
    --- 44,78 ----
    ! ! ! /images/background-mem.gif"> ! ! ! ! + + + + +
    ">"> - )">+
      * ! ! "> ! "> ! "> ! "> ! ">
    +   + + +
    >>>>
    +     +
    *************** *** 65,88 **** --- 80,115 ---- *************** *** 90,113 **** --- 117,152 ---- *************** *** 115,138 **** --- 154,189 ---- *************** *** 140,163 **** --- 191,226 ---- *************** *** 165,188 **** --- 228,263 ---- *************** *** 190,213 **** --- 265,300 ---- *************** *** 215,238 **** --- 302,337 ---- *************** *** 240,263 **** --- 339,374 ---- *************** *** 265,288 **** --- 376,404 ---- *************** *** 290,323 **** ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> !
    --- 406,439 ---- ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! *************** *** 328,336 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 444,452 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 357,361 **** if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) { // We should not flag an error unless the tag is also ! // mandatory, or if something else in the tag is entered if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) { --- 473,477 ---- if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) { // We should not flag an error unless the tag is also ! // mandatory, ou if something else in the tag is entered if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) { *************** *** 385,400 **** var alertString2; if (total_errors!=0) { ! alertString2 = "Saisie invalide pour les raisons suivantes :\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; ! alertString2 += "- "+ total_missing_mandatory_tags +" zones obligatoires vides\n"; ! alertString2 += "- "+ total_missing_mandatory_subfields +" sous-zones obligatoires vides (voir sous-zones en gras)"; alert(alertString2); } else { ! document.f.submit(); } } function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=600,height=400,toolbar=false,scrollbars=yes'); } --- 501,516 ---- var alertString2; if (total_errors!=0) { ! alertString2 = "Form not submitted because sur the following problem(s)\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; ! alertString2 += "- "+ total_missing_mandatory_tags +" mandatory tags empty\n"; ! alertString2 += "- "+ total_missing_mandatory_subfields +" mandatory fields empty (see bold subfields)"; alert(alertString2); } else { ! document.forms[0].submit(); } } function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=oui'); } *************** *** 415,420 **** } } ! newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes'); } function AddField(field) { document.forms[0].op.value = "addfield"; --- 531,537 ---- } } ! newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=oui'); } + function AddField(field) { document.forms[0].op.value = "addfield"; Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** addbooks.tmpl 3 Sep 2003 11:58:47 -0000 1.3 --- addbooks.tmpl 11 Feb 2004 09:00:21 -0000 1.4 *************** *** 1,18 **** ! ! Import et saisie de notices !

    ! Pas d'exemplaires ! !

    ! Site web ajouté !

    !
    Pour ajouter une nouvelle notice, scanner le code barre ou saisir l'ISBN/ISSN/titre de l'ouvrage
    --- 1,18 ---- ! ! Gérer une notice biblio MARC !

    ! Pas d'ouvrages trouvés ! !

    ! Notice site Web ajoutée !

    !
    Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN.:
    *************** *** 22,29 **** ISBN: ! ! Si l'ouvrage est trouvé dans la table des notices actives, il sera rappelé et pourra être modifié.
    ! Si l'ouvrage est trouvé dans le réservoir, il pourra être appelé pour la saisie d'une nouvelle notice active.
    ! Sinon, il est possible de créer une notice à partir de 0 Titre --- 22,29 ---- ISBN: ! ! Si l'ISBN ou le titre est trouvé dans la table biblio, il sera récupéré et peut être modifié.
    ! Si l'ISBN ou le titre existe déjà dans le réservoir, il va être récupéré et une notice biblio sera ajoutée.
    ! Sinon, une notice biblio peut être créée manuellement. Titre *************** *** 31,39 ****   ! ! Créer une notice vide ! ! Créer une notice vide ! --- 31,39 ----   ! ! Créer une notice biblio vide ! ! Créer une notice biblio vide ! *************** *** 44,48 **** !
    Ajout d'un site web
    --- 44,48 ---- !
    Ajouter un nouveau site Web
    *************** *** 50,59 **** ! !
    mot-clef:

    ! --- 50,59 ---- ! !
    Mot-clé:

    ! Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** isbnsearch.tmpl 1 Apr 2003 13:46:43 -0000 1.2 --- isbnsearch.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,55 **** ! ! ! Résultats recherche de notices

    ! Votre recherche : ISBN , résultats trouvés
    ! Affichage des résultats à ! réponses
    ! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! !

    ! ! ! ! ! ! ! ! ! ! "> ! ! ! -
    TitreAuteurAnnée 
    ! ">Editer...
    !

    !
    Notices dans le réservoir
    --- 1,63 ---- ! ! Résultats de recherche Biblio

    ! Recherche effectuée sur ISBN title
    ! ! Résultats trouvés
    ! Résultats to affiché !

    ! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! !
    Notices bibliographiques dans Koha
    ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteur© 
    ! ">Ajouter items">Editer...
    Rien trouvé

    !
    Notices bibliographiques dans le réservoir
    *************** *** 59,75 **** Auteur ISBN ! vient de     ! ! "> ! ! ! ! ! ">créer notice !   --- 67,91 ---- Auteur ISBN ! provenant de     ! ! ! "> ! ! ! ! ! ! ! ! ">Ajouter une notice biblio ! ! ! ! Rien trouvé !   *************** *** 77,83 ****     ! ">Créer notice vierge ! --- 93,104 ----     ! ! ">Ajouter New Biblio ! ! ">Ajouter New Biblio ! !
    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detailprint.tmpl,1.1,1.2 catalogue-home.tmpl,1.5,1.6 cmsdsearchresults.tmpl,1.1,1.2 detail-opac.tmpl,1.1,1.2 detail.tmpl,1.6,1.7 MARCdetail.tmpl,1.7,1.8 moredetail.tmpl,1.4,1.5 searchresults.tmpl,1.2,1.3 subject.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Added Files: detailprint.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** catalogue-home.tmpl 18 Sep 2003 13:28:58 -0000 1.5 --- catalogue-home.tmpl 11 Feb 2004 09:00:21 -0000 1.6 *************** *** 1,12 **** ! ! ! ! !

    ! Recherche Catalogue
    --- 1,12 ---- ! ! ! ! ! !

    Recherche Catalogue

    *************** *** 14,29 **** ! ! ! - ! --- 14,31 ----
    Code barre exemplaires     OU
     
    ! Note :Utiliser un plus grand nombre de champs pour votre recherche (par ex. Mots-clés + auteur + cote) ralentira la recherche.

    ! ! ! ! *************** *** 33,45 **** !
    Code barre     OU
     
    ! AIDE
    ! Chercher :L'utilisation de plusieurs critères pour votre recherche ralentit le système.

    ! ! --- 35,49 ---- !
    Mots-clés
    Titre ! Normal ! Exacte
    ! ! ! ! *************** *** 52,101 **** ! ! ! ! ! ! ! - ! ! !
    Mots-clés
    Titre ! Normal ! Exact
    Dewey
    Cote
    OU
    Sujet
    ! ! ! !
    ! !

    ! Etagères virtuelles !

    ! --- 56,110 ---- ! ! Dewey ! Catégorie ! ! OU ! Sujet ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! Rayonnages virtuels !
    ! !

    !

    Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cmsdsearchresults.tmpl 3 Feb 2003 11:12:14 -0000 1.1 --- cmsdsearchresults.tmpl 11 Feb 2004 09:00:21 -0000 1.2 *************** *** 1,27 **** ! Résultats de la recherche ! ! ! ! ! !
    TitreAuteurDewey
    ! &startfrom=>Résultats précédents ! &startfrom=>Résultats suivants
    !
    Résultats à sur enregistrements.
    --- 1,28 ---- ! Résultats de recherche ! ! ! ! ! !
    TitreAuteurDewey
    ! &startfrom=>Previous Records ! &startfrom=>Next Records
    !
    ! Résultats à sur enregistrements.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail-opac.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail-opac.tmpl 3 Feb 2003 11:12:14 -0000 1.1 --- detail-opac.tmpl 11 Feb 2004 09:00:21 -0000 1.2 *************** *** 1,23 **** ! - -

    Connecté: [Déconnexion]

    - -

    Se connecter à Koha

    -     ! ! ! () !

    ! --- 1,17 ---- ! ! ! () !

    ! NOTICE !
    ! *************** *** 26,74 ****
    ! Sous-titre:
    ! Auteur:
    ! Autre auteur:
    ! Collection:
    ! Sujet:
    ! Date de publi.:
    ! Notes:
    ! Unititle:
    ! Pério.:
    ! Nombre d'ex.:

    ! Notice bibliographique !
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type de doc.Cote LocalisationRetour leDernière transaction
    Site webdisponibleen ligne &bib=&bi=">http://

    --- 20,68 ----
    ! Sous-titre:
    ! Auteur:
    ! Auteur supplémentaire:
    ! Titre Séries:
    ! Sujet:
    ! Copyright:
    ! Notes:
    ! Titre uniforme:
    ! Périodiques:
    ! Nombre total d'ouvrages:

    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catég ouvrageCatégorie LocalisationDate de retourVu
    Site WebEn ligneDisponible &bib=&bi=">http://

    *************** *** 78,80 ****

    ! --- 72,74 ----

    ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** detail.tmpl 14 Oct 2003 11:37:48 -0000 1.6 --- detail.tmpl 11 Feb 2004 09:00:21 -0000 1.7 *************** *** 1,114 **** ! ! ! ! ! !

    () ! ! ! ! class="button">Réservations ! !

    ! ! !
    ! Notice N°
    !
    " class="button">MARC

    ! Sous-titre: ! Auteur: >
    ! Autre Auteur:
     ! Publié par : ! en ! , ! ,
    ! Collection:
    ! Sujet:
    ! Année:
    ! Notes:
    ! Titre uniforme:
    ! Périodique:
    ! Côte dewey :
    ! URL :
    ! Nbre total d'exemplaires: !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type de documentCoteLocalisationRetour prévuDernière transactionCode-barresVolume
    >&item=&bi=">&item=>Fix Itemtype
    Site webdisponibleen ligne&bib=&bi=">http://

    - - - -

    HELP
    - Mettre à jour la notice pour tous les exemplaires: cliquez sur le bouton Modifier - [à gauche] pour modifier la notice. Tout changement sera répercuté sur la notice de tous les exemplaires ci-dessus.

    - Mettre à jour la notice pour UN ou QUELQUES exemplaires: - Si certains exemplaires ci-dessus doivent avoir une notice différente, ou sont liés à la mauvaise notice, vous devez utiliser le module - acquisitions. Vous devrez "re-commander" les exemplaires, et les effacer de cette notice. -


    --- 1,99 ---- ! ! ! ! ! ! ! ! !
    ! >Requests !
    ! ! () !

    ! ! !
    ! Notice bibliographique
    !
    " class="button">MARC

    ! ISBN:">
    ! Sous-titre:
    ! Auteur: ">
    ! Auteur supplémentaire:
    ! Publié par : ! en ! , ! ,
    ! Collection:
    ! Sujet:
    ! Année :
    ! Notes:
    ! Titre uniforme:
    ! Périodiques:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Nombre total d'ouvrages:
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catég ouvrageLocalisationDate de retourVuCode barreVolume
    &item=&bib=&bi="> ! &item=>Fix Itemtype !
    Site WebEn ligneDisponible ! &bib=&bi=">http:// !


    *************** *** 119,128 **** Résumé ! ! ! --- 104,113 ---- Résumé ! ! ! *************** *** 130,147 **** ! ! ! !
    Liens vers des sites web associés
    Titre:
    ! Description:
    ! URL:">http://
    --> ! --- 115,133 ---- ! ! ! !
    Links to ! Associated Websites
    Titre:
    ! Description:
    ! URL:">http://
    --> ! Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** MARCdetail.tmpl 6 Nov 2003 17:18:30 -0000 1.7 --- MARCdetail.tmpl 11 Feb 2004 09:00:21 -0000 1.8 *************** *** 1,3 **** ! --- 1,10 ---- ! ! !
    *************** *** 5,16 ****
    ! /images/background-mem.gif"> !
    ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">NormalMARC biblio :
    --- 12,24 ----     		! /images/background-mem.gif"> !
    ! ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">ImprimerNotice biblio MARC :
    *************** *** 31,35 ****
    8
    9
    Exemplaire
    --- 39,43 ----
    8
    9
    Ouvrage
    *************** *** 39,62 ****     		! ! ! class="button">Réservations !
    -
    ! ! /images/background-mem.gif"> ! ! ! ! ! --- 47,69 ----
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! ! class="button">Réservation !
    ! ! /images/background-mem.gif"> ! ! ! ! ! *************** *** 67,82 ****
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! ! !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    --- 74,89 ---- *************** *** 84,99 **** --- 91,106 ---- *************** *** 101,116 **** --- 108,123 ---- *************** *** 118,133 **** --- 125,140 ---- *************** *** 135,150 **** --- 142,157 ---- *************** *** 152,167 **** --- 159,174 ---- *************** *** 169,184 **** --- 176,191 ---- *************** *** 186,201 **** --- 193,208 ---- *************** *** 203,218 **** --- 210,225 ---- *************** *** 220,231 **** --- 227,238 ---- *************** *** 240,244 **** document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 247,251 ---- document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 251,257 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** moredetail.tmpl 12 Sep 2003 13:26:59 -0000 1.4 --- moredetail.tmpl 11 Feb 2004 09:00:21 -0000 1.5 *************** *** 1,49 **** !

    !
    ! >Réservations

    &type=intra> ! ()

    ! > ! > ! --- 1,49 ---- !

    !
    /images/background-mem.gif" ! > GROUPE -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! numéro de notice:
    ! Type de document:
    ! URL :
    ! Durée de prêt :
    ! Coût du prêt :
    ! Cote :
    ! ISBN:
    ! Editeur :
    ! Lieu :
    ! Date:
    ! Volume :
    ! Pages :
    ! Ill :
    ! Taille :
    ! Notes :
    ! Nbre d'exemplaires :
    ! >Requests

    &type=intra> ! ()

    ! > ! > ! *************** *** 51,95 ****
    /images/background-mem.gif" ! > GROUP -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Biblionumber:
    ! Catég ouvrage:
    ! URL:
    ! Durée de prêt:
    ! Coût du prêt:
    ! Classification:
    ! ISBN:
    ! Editeur:
    ! Lieu:
    ! Date:
    ! Volume:
    ! Pages:
    ! Ill.:
    ! Taille:
    ! Notes:
    ! Nombre d'ouvrages:

    !     ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">CODE-BARRES !
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Localisation d'origine :
    ! Dernière transaction :
    ! Dernier emprunt :
    ! ! Dernier emprunteur 1 :
    ! Last Borrower 2 :
    ! Localisation actuelle :
    ! Prix de remplacement :
    ! Exemplaire perdu :
    ! Payé :
    ! Notes:
    ! Prolongations :
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Cancelled:
    &bi=&itm=> ! Nbre total de prets :
    ! Numéro de groupe :
    ! Numéro de notice :
    --- 51,95 ----
    ! ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">CODE BARRE !
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Annexe propriétaire:
    ! Vu:
    ! Dernier prêt:
    ! ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Prix Remplacement:
    ! Ouvrage perdu:
    ! Payé pour:
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=oui"> Accession ! Date:
    ! Annulé:
    &bi=&itm=>Total ! Prêts:
    ! N° Groupe:
    ! N° Biblio:
    *************** *** 100,104 ****
    !

    --- 100,104 ---- !

    *************** *** 106,108 ****

    ! --- 106,108 ----
    ! Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** searchresults.tmpl 4 Sep 2003 16:01:02 -0000 1.2 --- searchresults.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,114 **** ! ! ! ! !
    - -

    Connecté: [Déconnexion]

    - -

    Se connecter à Koha

    -     ! ! Votre recherche : ! ! Vous n'avez spécifié aucun critère de recherche
    !     ! ! résultats trouvés

    ! ! ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! !

    ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    TitreAuteurAnnéeNbre d'exemplairesLocalisation 
    ?type=opacintra&bib=>&type=opacintra> >Réservation
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Résultats précédents ! !   ! ! ! ! &=&type=opacintra>Résultats suivants ! !   ! !
    !
    ! !
    ! Résultats à sur enregistrements. !

    ! ! Essayez une nouvelle recherche ! ! ! Essayez une nouvelle recherche ! ! ! ! ! ! ! ! --- 1,101 ---- ! ! ! ! !
    + + Recherche effectuée sur + + Vous n'avez pas spécifié de critère
    + ! Résultats trouvés

    + + + &=&type=opacintra>/images/numbers/prev.gif border=0> + + /images/numbers/placeholder.gif border=0> + + + + /images/numbers/-highlight.gif> + + &=&type=opacintra>/images/numbers/.gif border=0> + + + + &=&type=opacintra>/images/numbers/next.gif border=0> + + /images/numbers/placeholder.gif border=0> + !

    ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
    TitreAuteur©Nombre d'ouvragesLocalisation 
    ?type=opacintra&bib=>&type=opacintra> >Réservation
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! ! !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! ! &=&type=opacintra>Next Records ! !   ! !
    !
    ! !
    ! Résultats à sur enregistrements. !

    ! ! Essayer une autre recherche ! ! ! Essayer une autre recherche ! ! ! ! ! ! ! ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** subject.tmpl 1 Apr 2003 13:50:05 -0000 1.2 --- subject.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,41 **** ! ! ! ! ! ! ! !

    Connecté: [Déconnexion]

    ! !

    Se connecter à Koha

    !
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Sujet
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Résultats précédents ! ! &startfrom=>Résultats suivants !
    !

    ! Résultats à sur résultats.
    ! ! ! ! ! --- 1,51 ---- ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sujet
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Résultats à sur enregistrements.
    ! ! ! ! ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.3,1.4 acquire.tmpl,1.1,1.2 basket.tmpl,1.5,1.6 newbasket2.tmpl,1.4,1.5 newbasket.tmpl,1.1,1.2 newbiblio.tmpl,1.5,1.6 order.tmpl,1.3,1.4 recieveorder.tmpl,1.1,1.2 recieve.tmpl,1.1,1.2 supplier.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27625/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieveorder.tmpl recieve.tmpl supplier.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** acqui-home.tmpl 22 Sep 2003 13:04:48 -0000 1.3 --- acqui-home.tmpl 11 Feb 2004 09:00:47 -0000 1.4 *************** *** 1,14 **** ! ! Acquisitions
    ! !
    ! Débuter, réceptionner, modifier une commande
    N° ou nom du vendeur
    --- 1,14 ---- ! !

    Acquisitions


    ! !
    ! COMMENCER, RECEVOIR, MODIFIER UNE COMMANDE
    Nom du fournisseur *************** *** 18,96 ****
    !
    ! ! ! ! ! -
    Budgets
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    BudgetsTotalDépenséEngagéDispo
    Total

    ! Utiliser la fonction "mise à jour" (ctrl-r) pour mettre à jour les valeurs. ! Les montants engagés sont approximatifs, ils varient en fonction des taux de change.
    ! ! ! ! !
    Taux de change
    ! ! " value=>

    ! Aide
    ! Commande:

    Pour débuter une acquisition, chercher tout d'abord le vendeur. Vous pourrez ensuite créer un nouveau "panier".

    !

    Pour commander un exemplaire, vous devez vérifier qu'une notice existe déjà, et soit ajouter un exemplaire, soit créer une nouvelle notice et y ajouter un exemplaire

    !

    Pour commencer un nouveau panier avec un nouveau fournisseur, revenez à cette page, et passez par la recherche d'un fournisseur

    !

    Pour cloturer un panier, cliquer sur "voir panier", et choisir "confirmer panier"
    ! --- 18,115 ----
    ! ! ! !
    ! RECEPTIONNE OU MODIFIE UNE COMMANDE PERIODIQUE !
    Recherche Titre !
    ! !
    + +
    + ! ! ! ! !
    TAUX DE CHANGE
    ! ! " value=>
    + + + + + + + + + + +
    BUDGETS ET COMPTES
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Budgets TotalDépenséEngagéDisp.
    Total
    +

    + Rafraichissez la page pour avoir les derniers chiffres. Les montants engagés sont approximatifs, car les taux de change peuvent modifier le montant effectivement payé. +

    +
    +
    !

    AIDE commande:

    !
      Pour faire une acquisition, soit par commande, par achat direct ou par un don, commencer par rechercher le fournisseur. Ajoutez-en un si nécessaire.
    !
      Sélectionnez ensuite un panier ou créez-en un nouveau. Note: le panier sera rattaché à cet utilisateur
    !
      Pour commander un ouvrage, une notice biblio doit exister pour l'ajouter ou alors il faut d'abord créer une nouvelle notice biblio avant de l'ajouter.
    !

    Pour quittez un panier, cliquez sur "Voir les paniers" ou Recherche ci-dessus, puis cliquez sur "Confirmer le panier".
    ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquire.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- acquire.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,14 **** !
    ! Facture :
    ! Réceptionnée par :
    !
    ! Réception pour : facture,
    !
    ! - Receive Order
    ! Panier pour : !
    Commande passée le :

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 25,73 ---- !

    - Recevoir Commande


    ! Panier pour: !
    Commande envoyée:

    /images/background-mem.gif" colspan=2> ! Détail catalogue
    Titre *" >
    Auteur" >
    Copyright" >
    Format
    ISBN">
    titre périodique">
    Site
    code barre exemplaire *">
    ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 77,91 **** --- 77,91 ---- *************** *** 93,134 ****
    /images/background-mem.gif" colspan=2> ! DETAILS CATALOGUE
    Titre *" >
    Auteur" >
    Date Copyright" >
    Format
    ISBN">
    Séries">
    Annexe
    Code barre d'un ouvrage *">
    ! > ! > ! > ! "> ! "> ! "> ! ! /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> ! ! &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0> !
    ! > ! > ! > ! "> ! "> ! "> ! ! ! ! &id=>Editer !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>Détails financiers
    Fonds *
    Quantité commandée">
    Quantité Reçue *">
    Cout remplacement">
    cout budgété">
    Cout réel *">
    Facture N° ! ! ">
    Notes">
    --- 93,134 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAILS COMPTABILITE
    Comptes *
    Quantité commandée">
    Quantité reçue *">
    Frais Remplacement">
    Coûts budgetés ">
    Coût effectif *">
    N° facture ! ! ">
    Notes">
    *************** *** 137,141 ****

     

    !
    --- 137,141 ----

     

    !
    *************** *** 144,162 **** Panier ISBN ! TITLE AUTEUR ! Qté Reçu ! ! ! ! &biblio=&invoice=&freight=&gst=&id=> ! ! ! ! ! --- 144,162 ---- Panier ISBN ! TITRE AUTEUR ! Quantité Reçu ! ! ! ! &biblio=&invoice=&freight=&gst=&id=> ! ! ! ! ! Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** basket.tmpl 17 Sep 2003 13:34:11 -0000 1.5 --- basket.tmpl 11 Feb 2004 09:00:47 -0000 1.6 *************** *** 1,57 **** ! ! Panier pour >
    ! (Référence: , #, passée par : )

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! ! ! --- 1,57 ---- ! !

    Panier pour >


    ! Notre ref: , # validée par

    N° cmde Isbn Titre AuteurPx remplPx estQtéRecuTotal
    &id=&basket=">
    AIDE
    ! Pour changer un élément de cataloguage ou de comptabilité attaché à une commande, cliquer sur le titre
    		Sous-Total>
    TVA>
    TOTAL>
    ! "> ! "> ! Ajouter commande : entrer mot clef ou titre de notice
    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! ! ! *************** *** 61,63 **** ! --- 61,63 ---- ! Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** newbasket2.tmpl 17 Sep 2003 13:34:11 -0000 1.4 --- newbasket2.tmpl 11 Feb 2004 09:00:47 -0000 1.5 *************** *** 1,76 **** ! !

    Panier pour:

    ! ! &basket=&sub="> ! //images/filenew.png" align=right alt="Ajouter Notice" border=0> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter Notice"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Voir Panier">
    ! > ! > ! Nouvelle Recherche:
    ! Votre recherche: ! ! !
    ! résultats. !
    Affichage des résultats à . !
    Commande Editeur Isbn Titre Auteur$ rrp$estQuantité Total
    &id=&basket=">
    AIDE
    ! Pour changer n'importe quelle information attachée à cette commande, cliquez sur le titre.
    		Sous-total
    GST
    TOTAL
    ! "> ! "> ! Ajouter une commande : entrez un mot-clé ou un titre:
    "> ! /images/background-mem.gif"> ! ! ! ! "> ! !
    TITRE AUTEURANNEENOMBRE LOCALISATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! &type="> ! ! ! !
      --- 1,76 ---- ! !

    Panier pour:

    ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter New Biblio"> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter New Biblio"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Voir Panier">
    ! > ! > ! Nouvelle recherche:

    ! Recherche effectuée sur ! ! !
    ! Résultats trouvés. !
    Résultats to affiché. ! ! ! ! ! ! "> ! !
    TITRE AUTEUR©COMPTE LOCALISATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! &type="> ! ! ! !
      *************** *** 91,100 ****
    ! ! &offset=&type=&id=&basket=&search=&author="> Next !
    ! --- 91,100 ----
    ! ! &offset=&type=&id=&basket=&search=&author="> Next !

    ! Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newbasket.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- newbasket.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,14 **** ! ! Panier for
    ! (Référence: , #, passée par : )
    ! Tel: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Chercher mot-clef ou titre:
    --- 1,14 ---- ! !

    Panier for


    ! (Notre ref: , #, validée par: )
    ! Tél.: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Rechercher Mot-clé ou Titre:
    *************** *** 16,36 **** ! ! ! ! > ! ! ! ! ! !
    N° cmde Isbn Titre AuteurQté
    ! --- 16,36 ---- ! ! ! ! > ! ! ! ! ! !
    Commande Isbn Titre AuteurQuantité
    ! Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** newbiblio.tmpl 17 Sep 2003 13:34:11 -0000 1.5 --- newbiblio.tmpl 11 Feb 2004 09:00:47 -0000 1.6 *************** *** 1,7 **** !
    ! ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! !
    ! - Détail commande
    ! Panier pour : !     		! "> ! //images/1uparrow.png" border=0 alt="View Basket"> ! !

    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAIL CATALOGUE
    Titre *">
    Auteur" >
    Date copyright">
    Catégorie
    ISBN">
    Périodiques">
    Site
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! ! ! --- 51,143 ---- ! ! --> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Voir Panier !

    - Commande Details


    ! Panier pour:

    /images/background-mem.gif" colspan=2>DETAILS FINANCIERS
    Quantité" onchange='update(this.form)' >
    Fonds
    Prix fournisseur" onchange='update(this.form)'>
    Coût remplacement
    		" onchange='update(this.form)'>
    Cout budgété
    		" onchange='update(this.form)'>
    Taxes
    TOTAL BUDGETE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAILS CATALOGUE
    Titre *">
    Auteur" >
    Editeur" >
    Date Copyright">
    Format
    ISBN">
    Séries">
    Annexe
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 153,160 **** ! !
    /images/background-mem.gif" colspan=2>DETAILS COMPTABILITE
    Quantité" onchange='mettre à jour(this.form)' >
    Comptes
    Prix catalogue du fournisseur" onchange='mettre à jour(this.form)'>
    Frais Remplacement
    		" onchange='mettre à jour(this.form)'>
    Coûts budgetés
    (ex TVA, remise)     		" onchange='mettre à jour(this.form)'>
    GST budgeté
    TOTAL BUDGETE
    Notes">
    //images/2rightarrow.png" border=0 align=right>
    --- 150,158 ---- Notes ! "> ! ! *************** *** 162,173 ****
    !
    /images/background-mem.gif">HELP
      !
    • les champs en GRAS doivent être remplis pour créer une nouvelle notice et un exemplaire
      • !
    • Les champs en italique peuvent être utilisés pour faire une "réception rapide" lorsque les exemplaires seront réceptionnés

     

    ! --- 160,171 ----
    !
    /images/background-mem.gif">AIDE
      !
    • Les champs en gras sont obligatoires.

      !

    • Les champs ombrés peuvent être utilisés pour effectuer un retour "rapide", quand les ouvrages ont été acheté localement ou reçus en don. Dans ce cas, la quantité "commandée" sera aussi affectée dans la base de données à la quantité "reçue".

     

    ! Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** order.tmpl 17 Sep 2003 13:34:11 -0000 1.3 --- order.tmpl 11 Feb 2004 09:00:47 -0000 1.4 *************** *** 1,17 **** ! ! Recherche fournisseur
    ! vous avez cherché le fournisseur , réponses trouvées

    ! ! ! ! ! ! ! ! ! !
    N° cmdeLivraisonfournisseur ! ! --- 1,17 ---- ! !

    Résultats de recherche fournisseur


    ! Recherche effectuée sur Fournisseur , Résultats trouvés

    PanierExemplaireSaisi par Date
    ! ! ! ! ! > ! !
    CommandeRecevoirEntreprise ! ! *************** *** 20,52 **** ! ! > ! ! ! !
    PanierOuvragesEquipe Date
    ! ">/images/mail_send.png" title="Passer commande" ALT="Add" BORDER=0 > ! ">/images/mail_get.png" title="Livraison" ALT="Add" BORDER=0 > "> ! ! ! ! !
    ">
    -

    ! Ajouter fournisseur !

    !
    ! --- 20,52 ----
    ! ! /images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 > ! ! Inactif ! ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > ! ! ! ! !
    ">
    !
    ! Ajouter un fournisseur ! Index: recieveorder.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** recieveorder.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- recieveorder.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,29 **** ! ! Réceptionner commande du fournisseur

    ! >

    ! ! ! ! ! --- 1,29 ---- ! !

    Réceptionner commandes d'un fournisseur ">

    ! >

    INFORMATIONS DE FACTURE FOURNISSEUR
    N° commande fournisseur
    gst
    Port
    /images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
    ! ! ! ! ! *************** *** 31,33 **** ! --- 31,33 ---- ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** recieve.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- recieve.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,19 **** !
    ! Facture :
    ! Réceptionnée par :
    !
    ! Réception pour : , Facture
    ! "> ! "> ! "> ! "> ! Rechercher ISBN or Titre:

    --- 1,19 ---- !

    ! Facture:
    ! Reçu par:
    !
    !

    Sommaire pour : Facture

    ! "> ! "> ! "> ! "> ! Rechercher ISBN ou Titre:

    *************** *** 27,47 ****

    ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    INFORMATION FACTURE FOURNISSEUR
    N° de facture de fournisseur
    GST
    Fret
    AUTEUR ACTUELPortQTE TOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    --- 27,47 ----     		AUTEUR ACTUELP&PQUANTITE TOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    *************** *** 52,73 ****     		SUBTOTALS$$
    AIDE !
    Le total en bas de la page doit être le même que sur la facture à quelques cents près.

    ! Quand vous avez terminé, enregistrez les modifications     		GST?
    TOTAL?
    --- 52,74 ----

    		SOUS-TOTAUX$$
    AIDE !
    ! Le total au fond de la page devrait correspondre à quelques centimes au total de la facture.

    ! Quand vous avez fini cette facture, sauvegardez les changements.

    		GST$
    TOTAL$
    Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** supplier.tmpl 17 Sep 2003 13:34:11 -0000 1.4 --- supplier.tmpl 11 Feb 2004 09:00:47 -0000 1.5 *************** *** 1,159 **** !

    ! > ! Modification :

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - - -
    DETAIL FOURNISSEUR
    Nom fournisseur">
    Adresse !
    Adresse siège
    Tel">
    Fax">
    site web">
    CONTACT
    Nom">
    fonction">
    Tel">
    Autre tel">
    Fax">
    E-mail">
    Notes
    ! ! ! ! ! ! ! ! ! ! ! !
    STATUT
    Le fournisseur estchecked>Actif ! checked>Inactif
    INFORMATIONS COMMANDE
    Publications
    Les prix sont en
    Les factures sont en
    GST ! checked>Oui ! checked>Non
    Prix incluent la TVA ! checked>Oui ! checked>Non
    Le prix des factures incluent la TVA ! checked>Oui ! checked>Non
    remise> %
    !
    ! --- 1,164 ---- !
    ! > ! ! !

    Mettre à jour:

    ! !

    Ajouter un fournisseur

    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DETAILS ENTREPRISE
    Nom Entreprise">
    Adresse postale !
    Adresse physique
    Téléphone">
    Fax">
    Site Web">
    DETAILS CONTACT
    Nom du contact">
    Position">
    Téléphone">
    Autre téléphone">
    Fax">
    E-mail">
    Notes
    ! ! ! ! Actif ! Inactif ! ! ! ! ! ! ! ! ! ! !
    STATUT ACTUEL
    Le fournisseur est ! ! Actif ! Inactif
    INFORMATION COMMANDES
    Edition
    Prix catalogue sont
    Prix facturés sont
    GST enregistré ! checked>Oui ! checked>Non
    Prix catalogue de l'ouvrage inclus le GST ! checked>Oui ! checked>Non
    Prix de la facture de l'ouvrage inclus le GST ! checked>Oui ! checked>Non
    Rabais> %
    !
    !
    /images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" class="button">
    ! From acli at users.sourceforge.net Mon Feb 16 23:50:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 14:50:52 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator text-extract2.pl,1.32,1.33 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25717 Modified Files: text-extract2.pl Log Message: Minor factoring of construction of warning messages. Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** text-extract2.pl 14 Feb 2004 09:50:11 -0000 1.32 --- text-extract2.pl 16 Feb 2004 22:50:34 -0000 1.33 *************** *** 81,89 **** ############################################################################### ! sub warn_pedantic ($$) { ! my($flag, $msg) = @_; ! warn "Warning$pedantic_tag: $msg\n" if $pedantic_p || !$$flag; if (!$pedantic_p) { ! warn "Warning$pedantic_tag: Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; $$flag = 1; } --- 81,113 ---- ############################################################################### ! use vars qw( $appName $input_abbr ); ! ! sub construct_warn_prefix ($$) { ! my($prefix, $lc) = @_; ! # Construct some short but should-be-still-useful versions ! # of this script's name and the input file's name ! my $appName = $& if !defined $appName && $0 =~ /[^\/]+$/; ! my $input_abbr = $& if !defined $input_abbr && $input =~ /[^\/]+$/; ! # FIXME: The line number is not accurate, but should be "close enough" ! # FIXME: This wording is worse than what was there, but it's wrong to ! # FIXME: hard-code this thing in each warn statement. Need improvement. ! return "$appName: $prefix: " . (defined $lc? "$input_abbr: line $lc: ": "$input_abbr: "); ! } ! ! sub warn_normal ($$) { ! my($msg, $lc) = @_; ! my $prefix = construct_warn_prefix('Warning', $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg"; ! } ! ! sub warn_pedantic ($$$) { ! my($msg, $lc, $flag) = @_; ! my $prefix = construct_warn_prefix("Warning$pedantic_tag", $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg" if $pedantic_p || !$$flag; if (!$pedantic_p) { ! $prefix = construct_warn_prefix("Warning$pedantic_tag", undef); ! warn $prefix."Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; $$flag = 1; } *************** *** 105,110 **** $s = $rest; if ($val =~ /$re_tmpl_include/os) { ! warn "Warning: TMPL_INCLUDE in attribute" ! . (defined $lc? " near line $lc": '') . ": $val_orig\n"; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc --- 129,133 ---- $s = $rest; if ($val =~ /$re_tmpl_include/os) { ! warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc *************** *** 112,124 **** my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic \$pedantic_tmpl_var_use_in_nonpedantic_mode_p, "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . (defined $lc? " near line $lc": '') . ": $val_orig" if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic \$pedantic_attribute_error_in_nonpedantic_mode_p, "Unquoted attribute contains character(s) that should be quoted" ! . (defined $lc? " near line $lc": '') . ": $val_orig" if $t =~ /[^-\.A-Za-z0-9]/s; } --- 135,149 ---- my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . ": $val_orig", ! $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic "Unquoted attribute contains character(s) that should be quoted" ! . ": $val_orig", ! $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p if $t =~ /[^-\.A-Za-z0-9]/s; } *************** *** 127,137 **** if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! warn "Error: Completely confused while extracting attributes" ! . (defined $lc? " near line $lc": '') . ": $1\n"; ! warn "Error: " . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; $fatal_p = 1; } else { ! warn "Warning: Strange attribute syntax" ! . (defined $lc? " near line $lc": '') . ": $s\n"; } } --- 152,162 ---- if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! my $prefix = construct_warn_prefix('Error: ', $lc); ! warn $prefix . "Completely confused while extracting attributes" ! . ": $1\n"; ! warn $prefix . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; $fatal_p = 1; } else { ! warn "Strange attribute syntax: $s\n", $lc; } } *************** *** 159,163 **** } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn "Warning: Unescaped < near line $lc_0: $it\n" if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; ! warn "Warning: SGML \"closed start tag\" notation near line $lc_0: $1<\n" if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; ! warn "Warning: Syntax error in comment at line $lc_0: $&\n"; $syntaxerror_p = 1; } --- 200,208 ---- ($kind, $it, $readahead) = (KIND_TAG, "$1>", $3); $ok_p = 1; ! warn "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; ! warn "Syntax error in comment: $&\n", $lc_0; $syntaxerror_p = 1; } *************** *** 205,209 **** } } ! warn "Warning: Unrecognizable token found near line $lc_0: $it\n" if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): --- 230,234 ---- } } ! warn "Unrecognizable token found: $it\n", $lc_0 if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): *************** *** 352,356 **** } ! warn "Warning: This input will not work with Mozilla standards-compliant mode\n" if $syntaxerror_p; --- 377,381 ---- } ! warn "This input will not work with Mozilla standards-compliant mode\n", undef if $syntaxerror_p; From acli at users.sourceforge.net Tue Feb 17 00:42:59 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:42:59 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,NONE,1.1 VerboseWarnings.pm,NONE,1.1 text-extract2.pl,1.33,1.34 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4517 Modified Files: text-extract2.pl Added Files: TmplTokenizer.pm VerboseWarnings.pm Log Message: Pulled the tokenizer out into a module. Hope this has been done right. --- NEW FILE --- package TmplTokenizer; use strict; use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic ); require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplTokenizer.pm - Simple-minded tokenizer for HTML::Template .tmpl files =head1 DESCRIPTION Because .tmpl files contains HTML::Template directives that tend to confuse real parsers (e.g., HTML::Parse), it might be better to create a customized scanner to scan the template files for tokens. This module is a simple-minded attempt at such a scanner. =head1 HISTORY This tokenizer is mostly based on Ambrose's hideous Perl script known as subst.pl. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw( &KIND_TEXT &KIND_CDATA &KIND_TAG &KIND_DECL &KIND_PI &KIND_DIRECTIVE &KIND_COMMENT &KIND_UNKNOWN ); use vars qw( $input ); use vars qw( $debug_dump_only_p ); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); use vars qw( $fatal_p ); ############################################################################### # Hideous stuff use vars qw( $re_directive $re_tmpl_var $re_tmpl_var_escaped $re_tmpl_include ); use vars qw( $re_directive_control $re_tmpl_endif_endloop ); BEGIN { # $re_directive must not do any backreferences $re_directive = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:VAR|LOOP|INCLUDE|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # TMPL_VAR or TMPL_INCLUDE $re_tmpl_var = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; $re_tmpl_include = q{<(?:(?i)(?:!--\s*)?TMPL_(?:INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # TMPL_VAR ESCAPE=1/HTML/URL $re_tmpl_var_escaped = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR|INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))\s+ESCAPE=(?:1|HTML|URL)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # Any control flow directive $re_directive_control = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:LOOP|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # /LOOP or /IF or /UNLESS $re_tmpl_endif_endloop = q{<(?:(?i)(?:!--\s*)?\/TMPL_(?:LOOP|IF|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; } # Hideous stuff from subst.pl, slightly modified to use the above hideous stuff # Note: The $re_tag's set $1 (), and $3 (rest of string) use vars qw( $re_comment $re_entity_name $re_end_entity $re_etag ); use vars qw( $re_tag_strict $re_tag_compat @re_tag ); sub re_tag ($) { my($compat) = @_; my $etag = $compat? '>': '<>\/'; # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; } BEGIN { $re_comment = '(?:--(?:[^-]|-[^-])*--)'; $re_entity_name = '(?:[^&%#;<>\s]+)'; # NOTE: not really correct SGML $re_end_entity = '(?:;|$|(?=\s))'; # semicolon or before-whitespace $re_etag = q{(?:<\/?(?:"[^"]*"|'[^']*'|[^"'>\/])*[>\/])}; # end-tag @re_tag = ($re_tag_strict, $re_tag_compat) = (re_tag(0), re_tag(1)); } # End of the hideous stuff sub KIND_TEXT () { 'TEXT' } sub KIND_CDATA () { 'CDATA' } sub KIND_TAG () { 'TAG' } sub KIND_DECL () { 'DECL' } sub KIND_PI () { 'PI' } sub KIND_DIRECTIVE () { 'HTML::Template' } sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment sub KIND_UNKNOWN () { 'ERROR' } use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); ############################################################################### # Easy accessors sub fatal_p () { return $fatal_p; } sub syntaxerror_p () { return $syntaxerror_p; } ############################################################################### sub extract_attributes ($;$) { my($s, $lc) = @_; my %attr; $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { my($key, $val, $val_orig, $rest) = ($1, (defined $3? $3: defined $4? $4: $5), $2, $'); $i += 1; $attr{+lc($key)} = [$key, $val, $val_orig, $i]; $s = $rest; if ($val =~ /$re_tmpl_include/os) { warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc # XXX: there's just no reasonable thing to suggest my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; warn_pedantic "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" . ": $val_orig", $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p if defined $suggest && (pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; warn_pedantic "Unquoted attribute contains character(s) that should be quoted" . ": $val_orig", $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p if $t =~ /[^-\.A-Za-z0-9]/s; } } my $s2 = $s; $s2 =~ s/$re_tmpl_endif_endloop//g; # for the next check if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); $fatal_p = 1; } else { warn_normal "Strange attribute syntax: $s\n", $lc; } } return \%attr; } sub next_token_internal (*) { my($h) = @_; my($it, $kind); my $eof_p = 0; if (!defined $readahead || !length $readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; $readahead .= $next; } } $lc_0 = $lc; # remember line number of first line if ($eof_p && !length $readahead) { # nothing left to do ; } elsif ($readahead =~ /^\s+/s) { # whitespace ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); warn_normal "Warning: Unescaped < $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; $syntaxerror_p = 1; } last if $ok_p; my $next = scalar <$h>; $eof_p = !defined $next; last if $eof_p; $lc += 1; $readahead .= $next; } if ($kind ne KIND_TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { $kind = KIND_PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { $kind = KIND_DIRECTIVE; } if (!$ok_p && $eof_p) { ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): [$kind, $it]): undef; } sub next_token (*) { my($h) = @_; my $it; if (!$cdata_mode_p) { $it = next_token_internal($h); if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ($cdata_mode_p, $cdata_close) = (1, "") if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME push @$it, extract_attributes($it->[1], $lc_0); #FIXME } } else { for ($it = '';;) { my $lc_prev = $lc; my $next = next_token_internal($h); last if !defined $next; if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME $cdata_mode_p = 0; } last unless $cdata_mode_p; $it .= $next->[1]; #FIXME } $it = [KIND_CDATA, $it]; #FIXME $cdata_close = undef; } return defined $it? (wantarray? @$it: $it): undef; } ############################################################################### sub debug_dump (*) { # for testing only my($h) = @_; print "re_tag_compat is /$re_tag_compat/\n"; for (;;) { my $s = next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); my($kind, $t, $attr) = @$s; # FIXME printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); if ($kind eq KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { my($key, $val, $val_orig, $order) = @{$attr->{$a}}; printf "%s = %dH%s -- %s\n", $a, length $val, join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $val)), $val_orig; } } } } ############################################################################### sub trim ($) { my($s) = @_; $s =~ s/^(?:\s|\ $re_end_entity)+//os; $s =~ s/(?:\s|\ $re_end_entity)+$//os; return $s; } ############################################################################### sub text_extract (*) { my($h) = @_; my %text = (); for (;;) { my $s = next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME if ($kind eq KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; } elsif ($kind eq KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = trim $val; $text{$val} = 1 if $val =~ /\S/s; } } } } # Emit all extracted strings. # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (keys %text) { printf "%s\n", $t unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; } } ############################################################################### sub usage ($) { my($exitcode) = @_; my $h = $exitcode? *STDERR: *STDOUT; print $h <]+))*\s*(?:--)?)>}; ! # TMPL_VAR or TMPL_INCLUDE ! $re_tmpl_var = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! $re_tmpl_include = q{<(?:(?i)(?:!--\s*)?TMPL_(?:INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # TMPL_VAR ESCAPE=1/HTML/URL ! $re_tmpl_var_escaped = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR|INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))\s+ESCAPE=(?:1|HTML|URL)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # Any control flow directive ! $re_directive_control = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:LOOP|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # /LOOP or /IF or /UNLESS ! $re_tmpl_endif_endloop = q{<(?:(?i)(?:!--\s*)?\/TMPL_(?:LOOP|IF|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! } ! ! # Hideous stuff from subst.pl, slightly modified to use the above hideous stuff ! # Note: The $re_tag's set $1 (), and $3 (rest of string) ! use vars qw( $re_comment $re_entity_name $re_end_entity $re_etag ); ! use vars qw( $re_tag_strict $re_tag_compat @re_tag ); ! sub re_tag ($) { ! my($compat) = @_; ! my $etag = $compat? '>': '<>\/'; ! # This is no longer similar to the original regexp in subst.pl :-( ! # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} ! . $re_directive ! . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; ! } ! BEGIN { ! $re_comment = '(?:--(?:[^-]|-[^-])*--)'; ! $re_entity_name = '(?:[^&%#;<>\s]+)'; # NOTE: not really correct SGML ! $re_end_entity = '(?:;|$|(?=\s))'; # semicolon or before-whitespace ! $re_etag = q{(?:<\/?(?:"[^"]*"|'[^']*'|[^"'>\/])*[>\/])}; # end-tag ! @re_tag = ($re_tag_strict, $re_tag_compat) = (re_tag(0), re_tag(1)); ! } ! ! # End of the hideous stuff ! ! sub KIND_TEXT () { 'TEXT' } ! sub KIND_CDATA () { 'CDATA' } ! sub KIND_TAG () { 'TAG' } ! sub KIND_DECL () { 'DECL' } ! sub KIND_PI () { 'PI' } ! sub KIND_DIRECTIVE () { 'HTML::Template' } ! sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment ! sub KIND_UNKNOWN () { 'ERROR' } ! ! use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); ! use vars qw( $cdata_mode_p $cdata_close ); ! ! ############################################################################### ! ! use vars qw( $appName $input_abbr ); ! ! sub construct_warn_prefix ($$) { ! my($prefix, $lc) = @_; ! # Construct some short but should-be-still-useful versions ! # of this script's name and the input file's name ! my $appName = $& if !defined $appName && $0 =~ /[^\/]+$/; ! my $input_abbr = $& if !defined $input_abbr && $input =~ /[^\/]+$/; ! # FIXME: The line number is not accurate, but should be "close enough" ! # FIXME: This wording is worse than what was there, but it's wrong to ! # FIXME: hard-code this thing in each warn statement. Need improvement. ! return "$appName: $prefix: " . (defined $lc? "$input_abbr: line $lc: ": "$input_abbr: "); ! } ! ! sub warn_normal ($$) { ! my($msg, $lc) = @_; ! my $prefix = construct_warn_prefix('Warning', $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg"; ! } ! ! sub warn_pedantic ($$$) { ! my($msg, $lc, $flag) = @_; ! my $prefix = construct_warn_prefix("Warning$pedantic_tag", $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg" if $pedantic_p || !$$flag; ! if (!$pedantic_p) { ! $prefix = construct_warn_prefix("Warning$pedantic_tag", undef); ! warn $prefix."Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; ! $$flag = 1; ! } ! } ! ! ############################################################################### ! ! sub extract_attributes ($;$) { ! my($s, $lc) = @_; ! my %attr; ! $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags ! ! for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { ! my($key, $val, $val_orig, $rest) ! = ($1, (defined $3? $3: defined $4? $4: $5), $2, $'); ! $i += 1; ! $attr{+lc($key)} = [$key, $val, $val_orig, $i]; ! $s = $rest; ! if ($val =~ /$re_tmpl_include/os) { ! warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; ! } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { ! # XXX: we probably should not warn if key is "onclick" etc ! # XXX: there's just no reasonable thing to suggest ! my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); ! undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic ! "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . ": $val_orig", ! $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p ! if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); ! } elsif ($val_orig !~ /^['"]/) { ! my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic ! "Unquoted attribute contains character(s) that should be quoted" ! . ": $val_orig", ! $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p ! if $t =~ /[^-\.A-Za-z0-9]/s; ! } ! } ! my $s2 = $s; $s2 =~ s/$re_tmpl_endif_endloop//g; # for the next check ! if ($s2 =~ /\S/s) { # should never happen ! if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! my $prefix = construct_warn_prefix('Error: ', $lc); ! warn $prefix . "Completely confused while extracting attributes" ! . ": $1\n"; ! warn $prefix . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; ! $fatal_p = 1; ! } else { ! warn "Strange attribute syntax: $s\n", $lc; ! } ! } ! return \%attr; ! } ! ! sub next_token_internal (*) { ! my($h) = @_; ! my($it, $kind); ! my $eof_p = 0; ! if (!defined $readahead || !length $readahead) { ! my $next = scalar <$h>; ! $eof_p = !defined $next; ! if (!$eof_p) { ! $lc += 1; ! $readahead .= $next; ! } ! } ! $lc_0 = $lc; # remember line number of first line ! if ($eof_p && !length $readahead) { # nothing left to do ! ; ! } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn "Warning: Unescaped < $it\n", $lc_0 ! if !$cdata_mode_p && $it =~ /", $3); ! $ok_p = 1; ! warn "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); ! $ok_p = 1; ! warn "Syntax error in comment: $&\n", $lc_0; ! $syntaxerror_p = 1; ! } ! last if $ok_p; ! my $next = scalar <$h>; ! $eof_p = !defined $next; ! last if $eof_p; ! $lc += 1; ! $readahead .= $next; ! } ! if ($kind ne KIND_TAG) { ! ; ! } elsif ($it =~ /^).)*-->/; ! } elsif ($it =~ /^<\?/) { ! $kind = KIND_PI; ! } ! if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = KIND_DIRECTIVE; ! } ! if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); ! $syntaxerror_p = 1; ! } ! } ! warn "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq KIND_UNKNOWN; ! return defined $it? (wantarray? ($kind, $it): ! [$kind, $it]): undef; ! } ! ! sub next_token (*) { ! my($h) = @_; ! my $it; ! if (!$cdata_mode_p) { ! $it = next_token_internal($h); ! if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ! ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME ! push @$it, extract_attributes($it->[1], $lc_0); #FIXME ! } ! } else { ! for ($it = '';;) { ! my $lc_prev = $lc; ! my $next = next_token_internal($h); ! last if !defined $next; ! if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ! ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME ! $cdata_mode_p = 0; ! } ! last unless $cdata_mode_p; ! $it .= $next->[1]; #FIXME ! } ! $it = [KIND_CDATA, $it]; #FIXME ! $cdata_close = undef; ! } ! return defined $it? (wantarray? @$it: $it): undef; ! } ############################################################################### --- 16,26 ---- use Getopt::Long; + use TmplTokenizer; + use VerboseWarnings; use strict; use vars qw( $input ); use vars qw( $debug_dump_only_p ); ! use vars qw( $pedantic_p ); ############################################################################### *************** *** 268,274 **** sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$re_tag_compat/\n"; for (;;) { ! my $s = next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); --- 28,34 ---- sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$TmplTokenizer::re_tag_compat/\n"; for (;;) { ! my $s = TmplTokenizer::next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); *************** *** 277,281 **** printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { --- 37,41 ---- printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenizer::KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { *************** *** 293,298 **** sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $re_end_entity)+//os; ! $s =~ s/(?:\s|\ $re_end_entity)+$//os; return $s; } --- 53,58 ---- sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $TmplTokenizer::re_end_entity)+//os; ! $s =~ s/(?:\s|\ $TmplTokenizer::re_end_entity)+$//os; return $s; } *************** *** 304,314 **** my %text = (); for (;;) { ! my $s = next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; --- 64,74 ---- my %text = (); for (;;) { ! my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq TmplTokenizer::KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenizer::KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; *************** *** 329,333 **** for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; } } --- 89,93 ---- for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $TmplTokenizer::re_end_entity|$TmplTokenizer::re_tmpl_var)*$/os || $t =~ /^\d+$/; } } *************** *** 367,371 **** 'help' => sub { usage(0) }, ) || usage_error; ! $pedantic_tag = $pedantic_p? '': ' (negligible)'; usage_error('Missing mandatory option -f') unless defined $input; --- 127,135 ---- 'help' => sub { usage(0) }, ) || usage_error; ! ! VerboseWarnings::set_application_name $0; ! VerboseWarnings::set_input_file_name $input; ! VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') unless defined $input; *************** *** 378,384 **** warn "This input will not work with Mozilla standards-compliant mode\n", undef ! if $syntaxerror_p; close INPUT; ! exit(-1) if $fatal_p; --- 142,148 ---- warn "This input will not work with Mozilla standards-compliant mode\n", undef ! if TmplTokenizer::syntaxerror_p; close INPUT; ! exit(-1) if TmplTokenizer::fatal_p; From acli at users.sourceforge.net Tue Feb 17 00:46:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:46:38 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.1,1.2 text-extract2.pl,1.34,1.35 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5197 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Some functions should not be in the module; these are now removed. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplTokenizer.pm 16 Feb 2004 23:42:57 -0000 1.1 --- TmplTokenizer.pm 16 Feb 2004 23:46:34 -0000 1.2 *************** *** 266,294 **** ############################################################################### - sub debug_dump (*) { # for testing only - my($h) = @_; - print "re_tag_compat is /$re_tag_compat/\n"; - for (;;) { - my $s = next_token $h; - last unless defined $s; - printf "%s\n", ('-' x 79); - my($kind, $t, $attr) = @$s; # FIXME - printf "%s:\n", $kind; - printf "%4dH%s\n", length($t), - join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); - if ($kind eq KIND_TAG && %$attr) { - printf "Attributes:\n"; - for my $a (keys %$attr) { - my($key, $val, $val_orig, $order) = @{$attr->{$a}}; - printf "%s = %dH%s -- %s\n", $a, length $val, - join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $val)), - $val_orig; - } - } - } - } - - ############################################################################### - sub trim ($) { my($s) = @_; --- 266,269 ---- *************** *** 300,364 **** ############################################################################### - sub text_extract (*) { - my($h) = @_; - my %text = (); - for (;;) { - my $s = next_token $h; - last unless defined $s; - my($kind, $t, $attr) = @$s; # FIXME - if ($kind eq KIND_TEXT) { - $t = trim $t; - $text{$t} = 1 if $t =~ /\S/s; - } elsif ($kind eq KIND_TAG && %$attr) { - # value [tag=input], meta - my $tag = lc($1) if $t =~ /^<(\S+)/s; - for my $a ('alt', 'content', 'title', 'value') { - if ($attr->{$a}) { - next if $a eq 'content' && $tag ne 'meta'; - next if $a eq 'value' && ($tag ne 'input' - || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME - my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME - $val = trim $val; - $text{$val} = 1 if $val =~ /\S/s; - } - } - } - } - # Emit all extracted strings. - # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. - for my $t (keys %text) { - printf "%s\n", $t - unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; - } - } - - ############################################################################### - - sub usage ($) { - my($exitcode) = @_; - my $h = $exitcode? *STDERR: *STDOUT; - print $h <{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME ! $val = trim $val; $text{$val} = 1 if $val =~ /\S/s; } --- 70,74 ---- || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME ! $val = TmplTokenizer::trim $val; $text{$val} = 1 if $val =~ /\S/s; } From acli at users.sourceforge.net Tue Feb 17 00:50:58 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:50:58 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.2,1.3 text-extract2.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6213 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Avoid direct accessing of variables inside the module Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplTokenizer.pm 16 Feb 2004 23:46:34 -0000 1.2 --- TmplTokenizer.pm 16 Feb 2004 23:50:56 -0000 1.3 *************** *** 266,269 **** --- 266,276 ---- ############################################################################### + # Other easy functions + + sub blank_p ($) { + my($s) = @_; + return $s =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os; + } + sub trim ($) { my($s) = @_; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** text-extract2.pl 16 Feb 2004 23:46:34 -0000 1.35 --- text-extract2.pl 16 Feb 2004 23:50:56 -0000 1.36 *************** *** 28,32 **** sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$TmplTokenizer::re_tag_compat/\n"; for (;;) { my $s = TmplTokenizer::next_token $h; --- 28,32 ---- sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; for (;;) { my $s = TmplTokenizer::next_token $h; *************** *** 80,84 **** for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $TmplTokenizer::re_end_entity|$TmplTokenizer::re_tmpl_var)*$/os || $t =~ /^\d+$/; } } --- 80,84 ---- for my $t (keys %text) { printf "%s\n", $t ! unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } From acli at users.sourceforge.net Tue Feb 17 03:45:30 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 18:45:30 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplToken.pm,NONE,1.1 TmplTokenType.pm,NONE,1.1 TmplTokenizer.pm,1.3,1.4 VerboseWarnings.pm,1.1,1.2 text-extract2.pl,1.36,1.37 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6928 Modified Files: TmplTokenizer.pm VerboseWarnings.pm text-extract2.pl Added Files: TmplToken.pm TmplTokenType.pm Log Message: Further breaking up of the TmplTokenizer module. A couple of minor fixes. --- NEW FILE --- package TmplToken; use strict; use TmplTokenType; require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplToken.pm - Object representing a scanner token for .tmpl files =head1 DESCRIPTION This is a class representing a token scanned from an HTML::Template .tmpl file. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw(); ############################################################################### sub new { my $this = shift; my $class = ref($this) || $this; my $self = {}; bless $self, $class; ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}) = @_; return $self; } sub string { my $this = shift; return $this->{'_string'} } sub type { my $this = shift; return $this->{'_type'} } sub line_number { my $this = shift; return $this->{'_lc'} } sub attributes { my $this = shift; return $this->{'_attr'}; } sub set_attributes { my $this = shift; $this->{'_attr'} = ref $_[0] eq 'HASH'? $_[0]: \@_; return $this; } ############################################################################### 1; --- NEW FILE --- package TmplTokenType; use strict; require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplTokenType.pm - Types of TmplToken objects =head1 DESCRIPTION This is a Java-style "safe enum" singleton class for types of TmplToken objects. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw( &TEXT &CDATA &TAG &DECL &PI &DIRECTIVE &COMMENT &UNKNOWN ); ############################################################################### use vars qw( $_text $_cdata $_tag $_decl $_pi $_directive $_comment $_unknown ); BEGIN { my $new = sub { my $this = shift; my $class = ref($this) || $this; my $self = {}; bless $self, $class; ($self->{'id'}, $self->{'name'}, $self->{'desc'}) = @_; return $self; }; $_text = &$new(0, 'TEXT'); $_cdata = &$new(1, 'CDATA'); $_tag = &$new(2, 'TAG'); $_decl = &$new(3, 'DECL'); $_pi = &$new(4, 'PI'); $_directive = &$new(5, 'DIRECTIVE'); $_comment = &$new(6, 'COMMENT'); $_unknown = &$new(7, 'UNKNOWN'); } sub to_string { my $this = shift; return $this->{'name'} } sub TEXT () { $_text } sub CDATA () { $_cdata } sub TAG () { $_tag } sub DECL () { $_decl } sub PI () { $_pi } sub DIRECTIVE () { $_directive } sub COMMENT () { $_comment } sub UNKNOWN () { $_unknown } ############################################################################### 1; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TmplTokenizer.pm 16 Feb 2004 23:50:56 -0000 1.3 --- TmplTokenizer.pm 17 Feb 2004 02:45:27 -0000 1.4 *************** *** 2,5 **** --- 2,7 ---- use strict; + use TmplTokenType; + use TmplToken; use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic ); require Exporter; *************** *** 33,46 **** @ISA = qw(Exporter); ! @EXPORT_OK = qw( ! &KIND_TEXT ! &KIND_CDATA ! &KIND_TAG ! &KIND_DECL ! &KIND_PI ! &KIND_DIRECTIVE ! &KIND_COMMENT ! &KIND_UNKNOWN ! ); use vars qw( $input ); --- 35,39 ---- @ISA = qw(Exporter); ! @EXPORT_OK = qw(); use vars qw( $input ); *************** *** 92,104 **** # End of the hideous stuff - sub KIND_TEXT () { 'TEXT' } - sub KIND_CDATA () { 'CDATA' } - sub KIND_TAG () { 'TAG' } - sub KIND_DECL () { 'DECL' } - sub KIND_PI () { 'PI' } - sub KIND_DIRECTIVE () { 'HTML::Template' } - sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment - sub KIND_UNKNOWN () { 'ERROR' } - use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); --- 85,88 ---- *************** *** 180,188 **** ; } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn_normal "Warning: Unescaped < $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; --- 175,190 ---- if ($cdata_mode_p) { if ($readahead =~ /^$cdata_close/) { ! ($kind, $it, $readahead) = (TmplTokenType::TAG, $&, $'); $ok_p = 1; } else { ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $readahead, undef); $ok_p = 1; } } elsif ($readahead =~ /^$re_tag_compat/os) { ! ($kind, $it, $readahead) = (TmplTokenType::TAG, "$1>", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; *************** *** 214,237 **** $readahead .= $next; } ! if ($kind ne KIND_TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { ! $kind = KIND_PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = KIND_DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq KIND_UNKNOWN; ! return defined $it? (wantarray? ($kind, $it): ! [$kind, $it]): undef; } --- 198,220 ---- $readahead .= $next; } ! if ($kind ne TmplTokenType::TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { ! $kind = TmplTokenType::PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (TmplTokenType::UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? TmplToken->new($it, $kind, $lc): undef; } *************** *** 241,248 **** if (!$cdata_mode_p) { $it = next_token_internal($h); ! if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME ! push @$it, extract_attributes($it->[1], $lc_0); #FIXME } } else { --- 224,231 ---- if (!$cdata_mode_p) { $it = next_token_internal($h); ! if (defined $it && $it->type eq TmplTokenType::TAG) { ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->string =~ /^<(script|style|textarea)\b/i; ! $it->set_attributes( extract_attributes($it->string, $lc_0) ); } } else { *************** *** 251,265 **** my $next = next_token_internal($h); last if !defined $next; ! if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ! ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME $cdata_mode_p = 0; } last unless $cdata_mode_p; ! $it .= $next->[1]; #FIXME } ! $it = [KIND_CDATA, $it]; #FIXME $cdata_close = undef; } ! return defined $it? (wantarray? @$it: $it): undef; } --- 234,248 ---- my $next = next_token_internal($h); last if !defined $next; ! if (defined $next && $next->string =~ /$cdata_close/i) { ! ($lc, $readahead) = ($lc_prev, $next->string . $readahead); $cdata_mode_p = 0; } last unless $cdata_mode_p; ! $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $lc ); $cdata_close = undef; } ! return $it; } *************** *** 291,293 **** --- 274,288 ---- rework in tmpl_process.pl + Gettext-style line number references would also be very helpful in + disambiguating the strings. Ultimately, we should generate and work + with gettext-style po files, so that translators are able to use + tools designed for gettext. + + An example of a string untranslatable to Chinese is "Accounts for"; + "Accounts for %s", however, would be translatable. Short words like + "in" would also be untranslatable, not only to Chinese, but also to + languages requiring declension of nouns. + =cut + + 1; Index: VerboseWarnings.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/VerboseWarnings.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** VerboseWarnings.pm 16 Feb 2004 23:42:57 -0000 1.1 --- VerboseWarnings.pm 17 Feb 2004 02:45:27 -0000 1.2 *************** *** 25,31 **** @ISA = qw(Exporter); @EXPORT_OK = qw( - &set_application_name - &set_input_file_name - &set_pedantic_mode &pedantic_p &warn_normal --- 25,28 ---- *************** *** 46,50 **** my($s) = @_; $input = $s; ! $input_abbr = $& if !defined $input && defined $s && $s =~ /[^\/]+$/; } --- 43,47 ---- my($s) = @_; $input = $s; ! $input_abbr = $& if defined $s && $s =~ /[^\/]+$/; } Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** text-extract2.pl 16 Feb 2004 23:50:56 -0000 1.36 --- text-extract2.pl 17 Feb 2004 02:45:27 -0000 1.37 *************** *** 33,41 **** last unless defined $s; printf "%s\n", ('-' x 79); ! my($kind, $t, $attr) = @$s; # FIXME printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenizer::KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { --- 33,41 ---- last unless defined $s; printf "%s\n", ('-' x 79); ! my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenType::TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { *************** *** 57,65 **** my $s = TmplTokenizer::next_token $h; last unless defined $s; ! my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq TmplTokenizer::KIND_TEXT) { $t = TmplTokenizer::trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenizer::KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; --- 57,65 ---- my $s = TmplTokenizer::next_token $h; last unless defined $s; ! my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! if ($kind eq TmplTokenType::TEXT) { $t = TmplTokenizer::trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenType::TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; From acli at users.sourceforge.net Tue Feb 17 04:02:41 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 19:02:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenType.pm,1.1,1.2 text-extract2.pl,1.37,1.38 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11024 Modified Files: TmplTokenType.pm text-extract2.pl Log Message: Fixed more bugs during the modularization Index: TmplTokenType.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenType.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplTokenType.pm 17 Feb 2004 02:45:27 -0000 1.1 --- TmplTokenType.pm 17 Feb 2004 03:02:39 -0000 1.2 *************** *** 40,44 **** BEGIN { my $new = sub { ! my $this = shift; my $class = ref($this) || $this; my $self = {}; --- 40,44 ---- BEGIN { my $new = sub { ! my $this = 'TmplTokenType';#shift; my $class = ref($this) || $this; my $self = {}; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** text-extract2.pl 17 Feb 2004 02:45:27 -0000 1.37 --- text-extract2.pl 17 Feb 2004 03:02:39 -0000 1.38 *************** *** 34,38 **** printf "%s\n", ('-' x 79); my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); --- 34,38 ---- printf "%s\n", ('-' x 79); my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! printf "%s [line %d]:\n", $kind->to_string, $s->line_number; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); From acli at users.sourceforge.net Tue Feb 17 04:17:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 19:17:57 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13338 Modified Files: TmplTokenizer.pm Log Message: Still more bugfixes for my own bugs. $readahead is now an array @readahead which can contain TmplToken objects, so "ungetting" tokens should not disturb the line number counter any more. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** TmplTokenizer.pm 17 Feb 2004 02:45:27 -0000 1.4 --- TmplTokenizer.pm 17 Feb 2004 03:17:48 -0000 1.5 *************** *** 85,89 **** # End of the hideous stuff ! use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); --- 85,89 ---- # End of the hideous stuff ! use vars qw( @readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); *************** *** 152,171 **** my($it, $kind); my $eof_p = 0; ! if (!defined $readahead || !length $readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; ! $readahead .= $next; } } $lc_0 = $lc; # remember line number of first line ! if ($eof_p && !length $readahead) { # nothing left to do ; ! } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $&, $'); warn_normal "Unescaped < in $it\n", $lc_0 if !$cdata_mode_p && $it =~ /; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; ! push @readahead, $next; } } $lc_0 = $lc; # remember line number of first line ! if (@readahead && ref $readahead[$#readahead]) { # TmplToken object ! my $t = pop @readahead; ! ($it, $kind, local $lc) = ($t->string, $t->type, $t->line_number); ! } elsif ($eof_p && !@readahead) { # nothing left to do ; ! } elsif ($readahead[$#readahead] =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead[$#readahead] =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); warn_normal "Unescaped < in $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; --- 179,195 ---- for (;;) { if ($cdata_mode_p) { ! if ($readahead[$#readahead] =~ /^$cdata_close/) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TAG, $&, $'); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, pop @readahead); $ok_p = 1; } ! } elsif ($readahead[$#readahead] =~ /^$re_tag_compat/os) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TAG, "$1>", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead[$#readahead] =~ /^).)*-->/s) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; *************** *** 196,200 **** last if $eof_p; $lc += 1; ! $readahead .= $next; } if ($kind ne TmplTokenType::TAG) { --- 201,205 ---- last if $eof_p; $lc += 1; ! $readahead[$#readahead] .= $next; } if ($kind ne TmplTokenType::TAG) { *************** *** 210,214 **** } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (TmplTokenType::UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } --- 215,219 ---- } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::UNKNOWN, $readahead[$#readahead], undef); $syntaxerror_p = 1; } *************** *** 235,239 **** last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! ($lc, $readahead) = ($lc_prev, $next->string . $readahead); $cdata_mode_p = 0; } --- 240,245 ---- last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! push @readahead, $next; # push the entire TmplToken object ! #$lc = $lc_prev; XXX $cdata_mode_p = 0; } From acli at users.sourceforge.net Tue Feb 17 06:07:06 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 21:07:06 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.5,1.6 text-extract2.pl,1.38,1.39 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30220 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Converted TmplTokenizer into a class. Everything still seems ok, but it is not tested thoroughly. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** TmplTokenizer.pm 17 Feb 2004 03:17:48 -0000 1.5 --- TmplTokenizer.pm 17 Feb 2004 05:07:04 -0000 1.6 *************** *** 13,17 **** =head1 NAME ! TmplTokenizer.pm - Simple-minded tokenizer for HTML::Template .tmpl files =head1 DESCRIPTION --- 13,17 ---- =head1 NAME ! TmplTokenizer.pm - Simple-minded tokenizer class for HTML::Template .tmpl files =head1 DESCRIPTION *************** *** 32,45 **** ############################################################################### ! $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw(); - use vars qw( $input ); - use vars qw( $debug_dump_only_p ); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); - use vars qw( $fatal_p ); ############################################################################### --- 32,42 ---- ############################################################################### ! $VERSION = 0.02; @ISA = qw(Exporter); @EXPORT_OK = qw(); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); ############################################################################### *************** *** 85,106 **** # End of the hideous stuff ! use vars qw( @readahead $lc_0 $lc $syntaxerror_p ); ! use vars qw( $cdata_mode_p $cdata_close ); ############################################################################### ! # Easy accessors ! sub fatal_p () { ! return $fatal_p; } ! sub syntaxerror_p () { ! return $syntaxerror_p; } ############################################################################### ! sub extract_attributes ($;$) { my($s, $lc) = @_; my %attr; --- 82,234 ---- # End of the hideous stuff ! use vars qw( $serial ); ############################################################################### ! sub FATAL_P () {'fatal-p'} ! sub SYNTAXERROR_P () {'syntaxerror-p'} ! sub FILENAME () {'input'} ! sub HANDLE () {'handle'} ! ! sub READAHEAD () {'readahead'} ! sub LINENUM_START () {'lc_0'} ! sub LINENUM () {'lc'} ! sub CDATA_MODE_P () {'cdata-mode-p'} ! sub CDATA_CLOSE () {'cdata-close'} ! ! sub new { ! my $this = shift; ! my($input) = @_; ! my $class = ref($this) || $this; ! my $self = {}; ! bless $self, $class; ! ! my $handle = sprintf('TMPLTOKENIZER%d', $serial); ! $serial += 1; ! ! no strict; ! open($handle, "<$input") || die "$input: $!\n"; ! use strict; ! $self->{+FILENAME} = $input; ! $self->{+HANDLE} = $handle; ! $self->{+READAHEAD} = []; ! return $self; ! } ! ! ############################################################################### ! ! # Simple getters ! ! sub _handle { ! my $this = shift; ! return $this->{+HANDLE}; ! } ! ! sub fatal_p { ! my $this = shift; ! return $this->{+FATAL_P}; ! } ! ! sub syntaxerror_p { ! my $this = shift; ! return $this->{+SYNTAXERROR_P}; ! } ! ! sub has_readahead_p { ! my $this = shift; ! return @{$this->{+READAHEAD}}; ! } ! ! sub _peek_readahead { ! my $this = shift; ! return $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}]; } ! sub line_number_start { ! my $this = shift; ! return $this->{+LINENUM_START}; ! } ! ! sub line_number { ! my $this = shift; ! return $this->{+LINENUM}; ! } ! ! sub cdata_mode_p { ! my $this = shift; ! return $this->{+CDATA_MODE_P}; ! } ! ! sub cdata_close { ! my $this = shift; ! return $this->{+CDATA_CLOSE}; ! } ! ! # Simple setters ! ! sub _set_fatal { ! my $this = shift; ! $this->{+FATAL_P} = $_[0]; ! return $this; ! } ! ! sub _set_syntaxerror { ! my $this = shift; ! $this->{+SYNTAXERROR_P} = $_[0]; ! return $this; ! } ! ! sub _push_readahead { ! my $this = shift; ! push @{$this->{+READAHEAD}}, $_[0]; ! return $this; ! } ! ! sub _pop_readahead { ! my $this = shift; ! return pop @{$this->{+READAHEAD}}; ! } ! ! sub _append_readahead { ! my $this = shift; ! $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}] .= $_[0]; ! return $this; ! } ! ! sub _set_readahead { ! my $this = shift; ! $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}] = $_[0]; ! return $this; ! } ! ! sub _increment_line_number { ! my $this = shift; ! $this->{+LINENUM} += 1; ! return $this; ! } ! ! sub _set_line_number_start { ! my $this = shift; ! $this->{+LINENUM_START} = $_[0]; ! return $this; ! } ! ! sub _set_cdata_mode { ! my $this = shift; ! $this->{+CDATA_MODE_P} = $_[0]; ! return $this; ! } ! ! sub _set_cdata_close { ! my $this = shift; ! $this->{+CDATA_CLOSE} = $_[0]; ! return $this; } ############################################################################### ! sub _extract_attributes ($;$) { ! my $this = shift; my($s, $lc) = @_; my %attr; *************** *** 140,144 **** error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); ! $fatal_p = 1; } else { warn_normal "Strange attribute syntax: $s\n", $lc; --- 268,272 ---- error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); ! $this->_set_fatal( 1 ); } else { warn_normal "Strange attribute syntax: $s\n", $lc; *************** *** 148,198 **** } ! sub next_token_internal (*) { my($h) = @_; my($it, $kind); my $eof_p = 0; ! pop @readahead if @readahead && !ref $readahead[$#readahead] ! && !length $readahead[$#readahead]; ! if (!@readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { ! $lc += 1; ! push @readahead, $next; } } ! $lc_0 = $lc; # remember line number of first line ! if (@readahead && ref $readahead[$#readahead]) { # TmplToken object ! my $t = pop @readahead; ! ($it, $kind, local $lc) = ($t->string, $t->type, $t->line_number); ! } elsif ($eof_p && !@readahead) { # nothing left to do ; ! } elsif ($readahead[$#readahead] =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead[$#readahead] =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); ! warn_normal "Unescaped < in $it\n", $lc_0 ! if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead[$#readahead] =~ /^).)*-->/s) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $lc_0; ! $syntaxerror_p = 1; } last if $ok_p; --- 276,332 ---- } ! sub _next_token_internal { ! my $this = shift; my($h) = @_; my($it, $kind); my $eof_p = 0; ! $this->_pop_readahead if $this->has_readahead_p ! && !ref $this->_peek_readahead ! && !length $this->_peek_readahead; ! if (!$this->has_readahead_p) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { ! $this->_increment_line_number; ! $this->_push_readahead( $next ); } } ! $this->_set_line_number_start( $this->line_number ); # remember 1st line num ! if ($this->has_readahead_p && ref $this->_peek_readahead) { # TmplToken obj. ! ($it, $kind) = ($this->_pop_readahead, undef); ! } elsif ($eof_p && !$this->has_readahead_p) { # nothing left to do ; ! } elsif ($this->_peek_readahead =~ /^\s+/s) { # whitespace ! ($kind, $it) = (TmplTokenType::TEXT, $&); ! $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it) = (TmplTokenType::TEXT, $&); ! $this->_set_readahead( $' ); ! warn_normal "Unescaped < in $it\n", $this->line_number_start ! if !$this->cdata_mode_p && $it =~ /cdata_close;;) { ! if ($this->cdata_mode_p) { ! if ($this->_peek_readahead =~ /^$cdata_close/) { ! ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_set_readahead( $' ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $this->_pop_readahead); $ok_p = 1; } ! } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! ($kind, $it) = (TmplTokenType::TAG, "$1>"); ! $this->_set_readahead( $3 ); $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $this->line_number_start if $2 eq ''; ! } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ! ($kind, $it) = (TmplTokenType::COMMENT, $&); ! $this->_set_readahead( $' ); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $this->line_number_start; ! $this->_set_syntaxerror( 1 ); } last if $ok_p; *************** *** 200,205 **** $eof_p = !defined $next; last if $eof_p; ! $lc += 1; ! $readahead[$#readahead] .= $next; } if ($kind ne TmplTokenType::TAG) { --- 334,339 ---- $eof_p = !defined $next; last if $eof_p; ! $this->_increment_line_number; ! $this->_append_readahead( $next ); } if ($kind ne TmplTokenType::TAG) { *************** *** 211,252 **** $kind = TmplTokenType::PI; } ! if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::UNKNOWN, $readahead[$#readahead], undef); ! $syntaxerror_p = 1; } } ! warn_normal "Unrecognizable token found: $it\n", $lc_0 if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? TmplToken->new($it, $kind, $lc): undef; } ! sub next_token (*) { ! my($h) = @_; my $it; ! if (!$cdata_mode_p) { ! $it = next_token_internal($h); if (defined $it && $it->type eq TmplTokenType::TAG) { ! ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->string =~ /^<(script|style|textarea)\b/i; ! $it->set_attributes( extract_attributes($it->string, $lc_0) ); } } else { ! for ($it = '';;) { ! my $lc_prev = $lc; ! my $next = next_token_internal($h); last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! push @readahead, $next; # push the entire TmplToken object ! #$lc = $lc_prev; XXX ! $cdata_mode_p = 0; } ! last unless $cdata_mode_p; $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $lc ); ! $cdata_close = undef; } return $it; --- 345,388 ---- $kind = TmplTokenType::PI; } ! if ($it =~ /^$re_directive/ios && !$this->cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it) = (TmplTokenType::UNKNOWN, $this->_peek_readahead); ! $this->_set_readahead, undef; ! $this->_set_syntaxerror( 1 ); } } ! warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number)): undef; } ! sub next_token { ! my $this = shift; ! my $h = $this->_handle; my $it; ! if (!$this->cdata_mode_p) { ! $it = $this->_next_token_internal($h); if (defined $it && $it->type eq TmplTokenType::TAG) { ! if ($it->string =~ /^<(script|style|textarea)\b/i) { ! $this->_set_cdata_mode( 1 ); ! $this->_set_cdata_close( "" ); ! } ! $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); } } else { ! for ($it = '', my $cdata_close = $this->cdata_close;;) { ! my $next = $this->_next_token_internal($h); last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! $this->_push_readahead( $next ); # push entire TmplToken object ! $this->_set_cdata_mode( 0 ); } ! last unless $this->cdata_mode_p; $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); ! $this->_set_cdata_close, undef; } return $it; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** text-extract2.pl 17 Feb 2004 03:02:39 -0000 1.38 --- text-extract2.pl 17 Feb 2004 05:07:04 -0000 1.39 *************** *** 26,30 **** ############################################################################### ! sub debug_dump (*) { # for testing only my($h) = @_; print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; --- 26,30 ---- ############################################################################### ! sub debug_dump ($) { # for testing only my($h) = @_; print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; *************** *** 51,55 **** ############################################################################### ! sub text_extract (*) { my($h) = @_; my %text = (); --- 51,55 ---- ############################################################################### ! sub text_extract ($) { my($h) = @_; my %text = (); *************** *** 125,133 **** usage_error('Missing mandatory option -f') unless defined $input; ! open(INPUT, "<$input") || die "$0: $input: $!\n"; if ($debug_dump_only_p) { ! debug_dump(*INPUT); } else { ! text_extract(*INPUT); } --- 125,133 ---- usage_error('Missing mandatory option -f') unless defined $input; ! my $h = TmplTokenizer->new( $input ); if ($debug_dump_only_p) { ! debug_dump( $h ); } else { ! text_extract( $h ); } From acli at users.sourceforge.net Tue Feb 17 06:42:29 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 21:42:29 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.6,1.7 TmplToken.pm,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3053 Modified Files: TmplTokenizer.pm TmplToken.pm Log Message: Insert the filename of the token into the TmplToken object too Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** TmplTokenizer.pm 17 Feb 2004 05:07:04 -0000 1.6 --- TmplTokenizer.pm 17 Feb 2004 05:42:27 -0000 1.7 *************** *** 121,124 **** --- 121,129 ---- # Simple getters + sub filename { + my $this = shift; + return $this->{+FILENAME}; + } + sub _handle { my $this = shift; *************** *** 356,360 **** warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number)): undef; } --- 361,365 ---- warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number, $this->filename)): undef; } Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplToken.pm 17 Feb 2004 02:45:27 -0000 1.1 --- TmplToken.pm 17 Feb 2004 05:42:27 -0000 1.2 *************** *** 33,37 **** my $self = {}; bless $self, $class; ! ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}) = @_; return $self; } --- 33,37 ---- my $self = {}; bless $self, $class; ! ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}, $self->{'_path'}) = @_; return $self; } *************** *** 47,50 **** --- 47,55 ---- } + sub pathname { + my $this = shift; + return $this->{'_path'} + } + sub line_number { my $this = shift; From acli at users.sourceforge.net Tue Feb 17 07:30:41 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 22:30:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator text-extract2.pl,1.39,1.40 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9919 Modified Files: text-extract2.pl Log Message: Don't extract strings from the VALUE attributes of RADIO type INPUT fields; these aren't translatable. Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -r1.39 -r1.40 *** text-extract2.pl 17 Feb 2004 05:07:04 -0000 1.39 --- text-extract2.pl 17 Feb 2004 06:30:38 -0000 1.40 *************** *** 68,72 **** next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' ! || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; --- 68,72 ---- next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' ! || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; From acli at users.sourceforge.net Tue Feb 17 08:26:31 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 23:26:31 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19352 Modified Files: TmplTokenizer.pm Log Message: Allow trim to return the trimmed whitespace if the caller wants them. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** TmplTokenizer.pm 17 Feb 2004 05:42:27 -0000 1.7 --- TmplTokenizer.pm 17 Feb 2004 07:26:29 -0000 1.8 *************** *** 405,411 **** sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $re_end_entity)+//os; ! $s =~ s/(?:\s|\ $re_end_entity)+$//os; ! return $s; } --- 405,410 ---- sub trim ($) { my($s) = @_; ! $s =~ /^(\s|\ $re_end_entity)*(.*)(\s|\ $re_end_entity)*$/os; ! return wantarray? ($2, $1, $3): $2; } From acli at users.sourceforge.net Tue Feb 17 08:45:19 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 23:45:19 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21841 Modified Files: TmplTokenizer.pm Log Message: The previous change was wrong. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** TmplTokenizer.pm 17 Feb 2004 07:26:29 -0000 1.8 --- TmplTokenizer.pm 17 Feb 2004 07:45:17 -0000 1.9 *************** *** 404,410 **** sub trim ($) { ! my($s) = @_; ! $s =~ /^(\s|\ $re_end_entity)*(.*)(\s|\ $re_end_entity)*$/os; ! return wantarray? ($2, $1, $3): $2; } --- 404,413 ---- sub trim ($) { ! my($s0) = @_; ! my $l0 = length $s0; ! my $s = $s0; ! $s =~ s/^(\s|\ $re_end_entity)+//os; my $l1 = $l0 - length $s; ! $s =~ s/(\s|\ $re_end_entity)+$//os; my $l2 = $l0 - $l1 - length $s; ! return wantarray? (substr($s0, 0, $l1), $s, substr($s0, $l0 - $l2)): $s; } From oleonard at users.sourceforge.net Tue Feb 17 21:20:46 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:20:46 -0800 Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.9.2.1,1.9.2.2 Message-ID: Update of /cvsroot/koha/koha/opac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9775/opac Modified Files: Tag: rel_2_0 opac-detail.pl Log Message: Fix for Bug 679 (courtesy Stephen) Index: opac-detail.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -r1.9.2.1 -r1.9.2.2 *** opac-detail.pl 6 Jan 2004 15:46:17 -0000 1.9.2.1 --- opac-detail.pl 17 Feb 2004 20:20:44 -0000 1.9.2.2 *************** *** 41,44 **** --- 41,54 ---- } + my @subjects; + my $subject; + my @subj = split /, /,($dat->{'subject'}); #split returned string into array + foreach my $subjct (@subj) { + $subject= { + SUBJECTS => $subjct, + }; + push @subjects, $subject; + } + $template->param(norequests => $norequests); *************** *** 49,56 **** --- 59,68 ---- my $webarray=\@webbiblioitems; my $sitearray=\@websites; + my $subjectsarray=\@subjects; $template->param(BIBLIO_RESULTS => $resultsarray); $template->param(ITEM_RESULTS => $itemsarray); $template->param(WEB_RESULTS => $webarray); + $template->param(SUBJECTS => $subjectsarray); $template->param(SITE_RESULTS => $sitearray, LibraryName => C4::Context->preference("LibraryName"), From oleonard at users.sourceforge.net Tue Feb 17 21:39:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:39:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.11.2.4,1.11.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13703/koha-tmpl/opac-tmpl/default/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -C2 -r1.11.2.4 -r1.11.2.5 *** opac-detail.tmpl 26 Jan 2004 10:49:11 -0000 1.11.2.4 --- opac-detail.tmpl 17 Feb 2004 20:39:05 -0000 1.11.2.5 *************** *** 19,40 **** ! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    Published by : in , ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    Total Number of Items:     --- 19,48 ---- ! ISBN: ">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    Published by : in , ,
    ! Collection:
    ! ! ! ! Subject(s): ! : "> !
    ! ! ! ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    Total Number of Items:     From oleonard at users.sourceforge.net Tue Feb 17 21:40:35 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:40:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.1.2.2,1.1.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13934/koha-tmpl/opac-tmpl/css/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-detail.tmpl 13 Jan 2004 17:28:30 -0000 1.1.2.2 --- opac-detail.tmpl 17 Feb 2004 20:40:33 -0000 1.1.2.3 *************** *** 23,27 **** ISBN:
    Collection:
    ! Subject:
    Year :
    Notes:
    --- 23,35 ---- ISBN:
    Collection:
    ! ! ! ! Subject(s): ! : "> !
    ! ! ! Year :
    Notes:
    From oleonard at users.sourceforge.net Tue Feb 17 21:43:10 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:43:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-detail.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14640/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-detail.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-detail.tmpl 18 Mar 2003 19:52:36 -0000 1.2 --- opac-detail.tmpl 17 Feb 2004 20:43:07 -0000 1.2.2.1 *************** *** 1,143 **** ! ! ! ! ! ! Details ! ! ! ! ! ! ! ! ! ! ! ! ! ! Home >Searching >Details ! ! !

    ! ! ! ! ! ! !
    ! ! ! !

    ! ()
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subtitle:
    Copyright:
    Subject: "> |
    Biblio Record:
    !

    		!
    ! ! > !
    !
    !     !

    ! !

    Holdings Information

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     
    Type/Format
    Class
    Location
    Due Date
    Last Seen
    Barcode
    !

    ! ! ! ! ! ! ! ! ! ! ! --- 1,143 ---- ! ! ! ! ! ! Details ! ! ! ! ! ! ! ! ! ! ! ! ! ! Home >Searching >Details ! ! !

    ! ! ! ! ! ! !
    ! ! ! !

    ! ()
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subtitle:
    Copyright:
    Subject(s): ! : "> !
    Biblio Record:
    !

    		!
    ! ! > !
    !
    !     !

    ! !

    Holdings Information

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     
    Type/Format
    Class
    Location
    Due Date
    Last Seen
    Barcode
    !

    ! ! ! ! ! ! ! ! ! ! ! From oleonard at users.sourceforge.net Tue Feb 17 23:15:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 14:15:09 -0800 Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.32,1.32.2.1 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3237/circ Modified Files: Tag: rel_2_0 returns.pl Log Message: Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info Index: returns.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/returns.pl,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -C2 -r1.32 -r1.32.2.1 *** returns.pl 28 Oct 2003 19:34:05 -0000 1.32 --- returns.pl 17 Feb 2004 22:15:06 -0000 1.32.2.1 *************** *** 189,192 **** --- 189,199 ---- $template->param( found => 1, name => $name, + borfirstname => $borr->{'firstname'}, + borsurname => $borr->{'surname'}, + bortitle => $borr->{'title'}, + borphone => $borr->{'phone'}, + borstraddress => $borr->{'streetaddress'}, + borcity => $borr->{'city'}, + borzip => $borr->{'zipcode'}, bornum => $res->{'borrowernumber'}, borcnum => $borr->{'cardnumber'}, *************** *** 218,222 **** borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! bortown => $borr->{'town'}, boremail => $borr->{'emailadress'}, barcode => $barcode --- 225,230 ---- borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! borcity => $borr->{'city'}, ! borzip => $borr->{'zipcode'}, boremail => $borr->{'emailadress'}, barcode => $barcode From oleonard at users.sourceforge.net Tue Feb 17 23:15:36 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 14:15:36 -0800 Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.32,1.33 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3305/circ Modified Files: returns.pl Log Message: Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info Index: returns.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/returns.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** returns.pl 28 Oct 2003 19:34:05 -0000 1.32 --- returns.pl 17 Feb 2004 22:15:33 -0000 1.33 *************** *** 189,192 **** --- 189,199 ---- $template->param( found => 1, name => $name, + borfirstname => $borr->{'firstname'}, + borsurname => $borr->{'surname'}, + bortitle => $borr->{'title'}, + borphone => $borr->{'phone'}, + borstraddress => $borr->{'streetaddress'}, + borcity => $borr->{'city'}, + borzip => $borr->{'zipcode'}, bornum => $res->{'borrowernumber'}, borcnum => $borr->{'cardnumber'}, *************** *** 218,222 **** borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! bortown => $borr->{'town'}, boremail => $borr->{'emailadress'}, barcode => $barcode --- 225,230 ---- borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! borcity => $borr->{'city'}, ! borzip => $borr->{'zipcode'}, boremail => $borr->{'emailadress'}, barcode => $barcode From acli at users.sourceforge.net Wed Feb 18 07:39:36 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 17 Feb 2004 22:39:36 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator translator_doc.txt,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30946 Modified Files: translator_doc.txt Log Message: Updated w.r.t. the text-extract2.pl filter. Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** translator_doc.txt 11 Feb 2004 08:42:02 -0000 1.2 --- translator_doc.txt 18 Feb 2004 06:39:34 -0000 1.3 *************** *** 34,37 **** --- 34,38 ---- - HTML::Templates pb : if there is only a tag between 2 strings, text-extract sometimes merges both strings, and so can't replace them in the translated template. I've solved all those cases with a
    or another HTML statement. + The text-extract2.pl filter attempts to address this problem; it seems that the new filter is now working correctly. - SHORT STATEMENTS *************** *** 67,70 **** --- 68,74 ---- - meta html encoding (8859-1) to enable non european translations. + - DIFFERENT WORD ORDER + Some languages have different word order than English in sentences, or even in dates. For these languages, it is impossible to make a good translation at the moment. + COPYRIGHT ====== From acli at users.sourceforge.net Wed Feb 18 07:56:23 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 17 Feb 2004 22:56:23 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1378 Modified Files: TmplTokenizer.pm Log Message: Warn against Apache #include directive Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** TmplTokenizer.pm 17 Feb 2004 07:45:17 -0000 1.9 --- TmplTokenizer.pm 18 Feb 2004 06:56:19 -0000 1.10 *************** *** 347,350 **** --- 347,353 ---- $kind = TmplTokenType::DECL; $kind = TmplTokenType::COMMENT if $it =~ /^).)*-->/; + if ($kind == TmplTokenType::COMMENT && $it =~ /^ Using per-directory sticky tag `rel_2_0' From tipaul at users.sourceforge.net Thu Feb 19 11:14:38 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:14:38 -0800 Subject: [Koha-cvs] CVS: koha/bookshelves addbookbybiblionumber.pl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22484/bookshelves Added Files: Tag: rel_2_0 addbookbybiblionumber.pl Log Message: new feature : adding book to bookshelf from biblio detail screen. --- NEW FILE --- #!/usr/bin/perl #script to provide bookshelf management # WARNING: This file uses 4-character tabs! # # $Header: /cvsroot/koha/koha/bookshelves/Attic/addbookbybiblionumber.pl,v 1.1.2.1 2004/02/19 10:14:36 tipaul Exp $ # # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA use strict; use C4::Search; use C4::Biblio; use CGI; use C4::Output; use C4::BookShelves; use C4::Circulation::Circ2; use C4::Auth; use C4::Interface::CGI::Output; use HTML::Template; my $env; my $query = new CGI; my $biblionumber = $query->param('biblionumber'); my $shelfnumber = $query->param('shelfnumber'); if ($shelfnumber) { &AddToShelfFromBiblio($env, $biblionumber, $shelfnumber); print "Content-Type: text/html\n\n"; exit; } else { my ( $bibliocount, @biblios ) = getbiblio($biblionumber); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "bookshelves/addbookbybiblionumber.tmpl", query => $query, type => "intranet", authnotrequired => 0, flagsrequired => {catalogue => 1}, }); my ($shelflist) = GetShelfList(); my @shelvesloop; my %shelvesloop; foreach my $element (sort keys %$shelflist) { push (@shelvesloop, $element); $shelvesloop{$element} = $shelflist->{$element}->{'shelfname'}; } my $CGIbookshelves=CGI::scrolling_list( -name => 'shelfnumber', -values => \@shelvesloop, -labels => \%shelvesloop, -size => 1, -multiple => 0 ); $template->param(biblionumber => $biblionumber, title => $biblios[0]->{'title'}, author => $biblios[0]->{'author'}, CGIbookshelves => $CGIbookshelves, ); output_html_with_http_headers $query, $cookie, $template->output; } # $Log: addbookbybiblionumber.pl,v $ # Revision 1.1.2.1 2004/02/19 10:14:36 tipaul # new feature : adding book to bookshelf from biblio detail screen. # # Local Variables: # tab-width: 4 # End: From tipaul at users.sourceforge.net Thu Feb 19 11:16:35 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:16:35 -0800 Subject: [Koha-cvs] CVS: koha/C4 Catalogue.pm,1.36.2.1,1.36.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22883/C4 Modified Files: Tag: rel_2_0 Catalogue.pm Log Message: #662 prepare/execute with (?) Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -C2 -r1.36.2.1 -r1.36.2.2 *** Catalogue.pm 13 Jan 2004 17:30:23 -0000 1.36.2.1 --- Catalogue.pm 19 Feb 2004 10:16:31 -0000 1.36.2.2 *************** *** 828,835 **** my ($searchstring)=@_; my $dbh = C4::Context->dbh; ! my $query="Select * from aqbooksellers where name like '$searchstring%' or ! id = '$searchstring'"; my $sth=$dbh->prepare($query); ! $sth->execute; my @results; my $i=0; --- 828,834 ---- my ($searchstring)=@_; my $dbh = C4::Context->dbh; ! my $query="Select * from aqbooksellers where name like ? or id =? "; my $sth=$dbh->prepare($query); ! $sth->execute("$searchstring%",$searchstring); my @results; my $i=0; From tipaul at users.sourceforge.net Thu Feb 19 11:15:44 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:15:44 -0800 Subject: [Koha-cvs] CVS: koha/C4 BookShelves.pm,1.11.2.1,1.11.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22735/C4 Modified Files: Tag: rel_2_0 BookShelves.pm Log Message: new feature : adding book to bookshelf from biblio detail screen. Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -r1.11.2.1 -r1.11.2.2 *** BookShelves.pm 6 Feb 2004 14:16:55 -0000 1.11.2.1 --- BookShelves.pm 19 Feb 2004 10:15:41 -0000 1.11.2.2 *************** *** 54,58 **** @ISA = qw(Exporter); ! @EXPORT = qw(&GetShelfList &GetShelfContents &AddToShelf &RemoveFromShelf &AddShelf &RemoveShelf); my $dbh = C4::Context->dbh; --- 54,59 ---- @ISA = qw(Exporter); ! @EXPORT = qw(&GetShelfList &GetShelfContents &AddToShelf &AddToShelfFromBiblio ! &RemoveFromShelf &AddShelf &RemoveShelf); my $dbh = C4::Context->dbh; *************** *** 86,104 **** # hash. sub GetShelfList { ! # FIXME - These two database queries can be combined into one: ! # SELECT bookshelf.shelfnumber, bookshelf.shelfname, ! # count(shelfcontents.itemnumber) ! # FROM bookshelf ! # LEFT JOIN shelfcontents ! # ON bookshelf.shelfnumber = shelfcontents.shelfnumber ! # GROUP BY bookshelf.shelfnumber ! my $sth=$dbh->prepare("select shelfnumber,shelfname from bookshelf"); $sth->execute; my %shelflist; ! while (my ($shelfnumber, $shelfname) = $sth->fetchrow) { ! my $sti=$dbh->prepare("select count(*) from shelfcontents where shelfnumber=?"); ! # FIXME - Should there be an "order by" in here somewhere? ! $sti->execute($shelfnumber); ! my ($count) = $sti->fetchrow; $shelflist{$shelfnumber}->{'shelfname'}=$shelfname; $shelflist{$shelfnumber}->{'count'}=$count; --- 87,99 ---- # hash. sub GetShelfList { ! my $sth=$dbh->prepare("SELECT bookshelf.shelfnumber, bookshelf.shelfname, ! count(shelfcontents.itemnumber) as count ! FROM bookshelf ! LEFT JOIN shelfcontents ! ON bookshelf.shelfnumber = shelfcontents.shelfnumber ! GROUP BY bookshelf.shelfnumber order by shelfname"); $sth->execute; my %shelflist; ! while (my ($shelfnumber, $shelfname,$count) = $sth->fetchrow) { $shelflist{$shelfnumber}->{'shelfname'}=$shelfname; $shelflist{$shelfnumber}->{'count'}=$count; *************** *** 157,160 **** --- 152,170 ---- } } + sub AddToShelfFromBiblio { + my ($env, $biblionumber, $shelfnumber) = @_; + return unless $biblionumber; + my $sth = $dbh->prepare("select itemnumber from items where biblionumber=?"); + $sth->execute($biblionumber); + my ($itemnumber) = $sth->fetchrow; + $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); + $sth->execute($shelfnumber, $itemnumber); + if ($sth->rows) { + # already on shelf + } else { + $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); + $sth->execute($shelfnumber, $itemnumber); + } + } =item RemoveFromShelf *************** *** 240,243 **** --- 250,256 ---- # # $Log$ + # Revision 1.11.2.2 2004/02/19 10:15:41 tipaul + # new feature : adding book to bookshelf from biblio detail screen. + # # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul # fixing bugs in bookshelves management. From tipaul at users.sourceforge.net Thu Feb 19 11:20:00 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:00 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.85.2.4,1.85.2.5 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23353/C4 Modified Files: Tag: rel_2_0 Search.pm Log Message: Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85.2.4 retrieving revision 1.85.2.5 diff -C2 -r1.85.2.4 -r1.85.2.5 *** Search.pm 6 Feb 2004 14:21:54 -0000 1.85.2.4 --- Search.pm 19 Feb 2004 10:19:57 -0000 1.85.2.5 *************** *** 1336,1340 **** if ($datedue eq ''){ # $datedue="Available"; ! my ($restype,$reserves)=CheckReserves($data->{'itemnumber'}); if ($restype){ $datedue=$restype; --- 1336,1340 ---- if ($datedue eq ''){ # $datedue="Available"; ! my ($restype,$reserves)=C4::Reserves2::CheckReserves($data->{'itemnumber'}); if ($restype){ $datedue=$restype; From tipaul at users.sourceforge.net Thu Feb 19 11:20:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl opac.html,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl Modified Files: Tag: rel_2_0 opac.html Log Message: Index: opac.html =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac.html 9 Apr 2003 08:40:28 -0000 1.2 --- opac.html 19 Feb 2004 10:20:21 -0000 1.2.2.1 *************** *** 6,10 ****
    ! WELCOME TO KOHA
    --- 6,14 ---- ! ! !
    ! WELCOME TO KOHA
    ! BIENVENUE DANS KOHA
    From tipaul at users.sourceforge.net Thu Feb 19 11:20:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple additem.tmpl,1.13.2.2,1.13.2.3 isbnsearch.tmpl,1.11.2.1,1.11.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: Tag: rel_2_0 additem.tmpl isbnsearch.tmpl Log Message: Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -C2 -r1.13.2.2 -r1.13.2.3 *** additem.tmpl 26 Jan 2004 10:46:36 -0000 1.13.2.2 --- additem.tmpl 19 Feb 2004 10:20:21 -0000 1.13.2.3 *************** *** 17,20 **** --- 17,21 ---- ">//images/fileopen.png"> ">Normal + ')">Print MARC biblio : *************** *** 123,126 **** --- 124,131 ---- newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } + function Doprint(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } + function confirm_deletion(bibid,itemnum) { var is_confirmed = confirm('Do you confirm item deletion ?'); Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -r1.11.2.1 -r1.11.2.2 *** isbnsearch.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 --- isbnsearch.tmpl 19 Feb 2004 10:20:21 -0000 1.11.2.2 *************** *** 4,8 **** You searched on ISBN title
    ! results found
    Results to displayed --- 4,8 ---- You searched on ISBN title
    ! results found
    Results to displayed From tipaul at users.sourceforge.net Thu Feb 19 11:20:25 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.8.2.2,1.8.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl/intranet-tmpl/default/en/acqui Modified Files: Tag: rel_2_0 newbiblio.tmpl Log Message: Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -r1.8.2.2 -r1.8.2.3 *** newbiblio.tmpl 26 Jan 2004 10:46:36 -0000 1.8.2.2 --- newbiblio.tmpl 19 Feb 2004 10:20:22 -0000 1.8.2.3 *************** *** 94,98 **** ! Format --- 94,98 ---- ! Item type From tipaul at users.sourceforge.net Thu Feb 19 11:21:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:21:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bookshelves - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23606/koha-tmpl/intranet-tmpl/default/en/bookshelves Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves added to the repository --> Using per-directory sticky tag `rel_2_0' From tipaul at users.sourceforge.net Thu Feb 19 11:22:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:22:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23787/koha-tmpl/intranet-tmpl/default/en/bookshelves Added Files: Tag: rel_2_0 addbookbybiblionumber.tmpl Log Message: new feature : adding book to bookshelf from biblio detail screen. --- NEW FILE ---

    "> Title :
    Author :
    Add to virtual shelf :
    From tipaul at users.sourceforge.net Thu Feb 19 11:22:50 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:22:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.14.2.1,1.14.2.2 searchresults.tmpl,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23866/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 MARCdetail.tmpl searchresults.tmpl Log Message: new feature : adding book to bookshelf from biblio detail screen. Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -r1.14.2.1 -r1.14.2.2 *** MARCdetail.tmpl 10 Feb 2004 13:17:57 -0000 1.14.2.1 --- MARCdetail.tmpl 19 Feb 2004 10:22:46 -0000 1.14.2.2 *************** *** 20,23 **** --- 20,24 ---- ">Normal ')">Print + ')">Add to shelf MARC biblio : Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** searchresults.tmpl 26 Jan 2004 10:46:35 -0000 1.7.2.1 --- searchresults.tmpl 19 Feb 2004 10:22:46 -0000 1.7.2.2 *************** *** 55,59 **** ! >Request --- 55,63 ---- ! ! >Request ! ! Not Reservable ! From tipaul at users.sourceforge.net Thu Feb 19 11:24:19 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:24:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_60X.tmpl,1.2,1.2.2.1 unimarc_field_700_701_702.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24105/koha-tmpl/intranet-tmpl/default/en/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: textarea 5 lines instead of 10 Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** unimarc_field_60X.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- unimarc_field_60X.tmpl 19 Feb 2004 10:24:17 -0000 1.2.2.1 *************** *** 23,29 ****
    !
    !

    Recherche

    A B --- 23,29 ---- !
    !

    Search

    A B Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700_701_702.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** unimarc_field_700_701_702.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- unimarc_field_700_701_702.tmpl 19 Feb 2004 10:24:17 -0000 1.2.2.1 *************** *** 6,10 **** !

    "> "> --- 6,11 ---- !
    !

    "> "> *************** *** 14,18 **** "> "> !

    --- 15,19 ---- "> "> ! *************** *** 23,27 **** "> ! --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:24:40 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:24:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en thesaurus_popup.tmpl,1.4.2.1,1.4.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24149/koha-tmpl/intranet-tmpl/default/en Modified Files: Tag: rel_2_0 thesaurus_popup.tmpl Log Message: textarea 5 lines instead of 10 Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** thesaurus_popup.tmpl 26 Jan 2004 10:46:35 -0000 1.4.2.1 --- thesaurus_popup.tmpl 19 Feb 2004 10:24:32 -0000 1.4.2.2 *************** *** 5,9 ****
    !

    --- 5,9 ---- !

    *************** *** 24,28 **** "> !

    --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue searchresults.tmpl,1.2.2.4,1.2.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: Tag: rel_2_0 searchresults.tmpl Log Message: french version of previous commits Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -r1.2.2.4 -r1.2.2.5 *** searchresults.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 --- searchresults.tmpl 19 Feb 2004 10:26:06 -0000 1.2.2.5 *************** *** 55,59 **** ! >Réservation --- 55,63 ---- ! ! >Réservation ! ! Not Reservable ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr thesaurus_popup.tmpl,1.3.2.3,1.3.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr Modified Files: Tag: rel_2_0 thesaurus_popup.tmpl Log Message: french version of previous commits Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** thesaurus_popup.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.3 --- thesaurus_popup.tmpl 19 Feb 2004 10:26:04 -0000 1.3.2.4 *************** *** 5,9 ****
    !

    --- 5,9 ---- !

    *************** *** 24,28 **** "> !

    --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_60X.tmpl,1.2.2.3,1.2.2.4 unimarc_field_700_701_702.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: french version of previous commits Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** unimarc_field_60X.tmpl 10 Feb 2004 14:07:44 -0000 1.2.2.3 --- unimarc_field_60X.tmpl 19 Feb 2004 10:26:06 -0000 1.2.2.4 *************** *** 23,29 ****
    !
    !

    Recherche

    A B --- 23,29 ---- !
    !

    Chercher

    A B Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** unimarc_field_700_701_702.tmpl 10 Feb 2004 14:07:44 -0000 1.1.2.3 --- unimarc_field_700_701_702.tmpl 19 Feb 2004 10:26:06 -0000 1.1.2.4 *************** *** 6,10 **** !

    "> "> --- 6,11 ---- !
    !

    "> "> *************** *** 14,18 **** "> "> !

    --- 15,19 ---- "> "> ! *************** *** 23,27 **** "> ! --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui newbiblio.tmpl,1.5.2.4,1.5.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: Tag: rel_2_0 newbiblio.tmpl Log Message: french version of previous commits Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -C2 -r1.5.2.4 -r1.5.2.5 *** newbiblio.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.4 --- newbiblio.tmpl 19 Feb 2004 10:26:07 -0000 1.5.2.5 *************** *** 3,7 **** --- 94,98 ---- ! Catég ouvrage *************** *** 115,119 **** Quantité ! " onchange='mettre à jour(this.form)' > --- 115,119 ---- Quantité ! " onchange='update(this.form)' > *************** *** 123,143 **** Prix catalogue du fournisseur ! " onchange='mettre à jour(this.form)'> Frais Remplacement
    ! " onchange='mettre à jour(this.form)'> Coûts budgetés
    (ex TVA, remise) ! " onchange='mettre à jour(this.form)'> GST budgeté ! TOTAL BUDGETE ! --- 123,143 ---- Prix catalogue du fournisseur ! " onchange='update(this.form)'> Frais Remplacement
    ! " onchange='update(this.form)'> Coûts budgetés
    (ex TVA, remise) ! " onchange='update(this.form)'> GST budgeté ! TOTAL BUDGETE ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple additem.tmpl,1.5.2.4,1.5.2.5 isbnsearch.tmpl,1.2.2.4,1.2.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: Tag: rel_2_0 additem.tmpl isbnsearch.tmpl Log Message: french version of previous commits Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -C2 -r1.5.2.4 -r1.5.2.5 *** additem.tmpl 28 Jan 2004 16:44:57 -0000 1.5.2.4 --- additem.tmpl 19 Feb 2004 10:26:07 -0000 1.5.2.5 *************** *** 17,20 **** --- 17,21 ---- ">//images/fileopen.png"> ">Normal + ')">Imprimer Notice biblio MARC : *************** *** 123,126 **** --- 124,131 ---- newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=oui'); } + function Doprint(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } + function confirm_deletion(bibid,itemnum) { var is_confirmed = confirm('Do you confirm item deletion ?'); Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -r1.2.2.4 -r1.2.2.5 *** isbnsearch.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 --- isbnsearch.tmpl 19 Feb 2004 10:26:07 -0000 1.2.2.5 *************** *** 4,8 **** Recherche effectuée sur ISBN title
    ! Résultats trouvés
    Résultats to affiché --- 4,8 ---- Recherche effectuée sur ISBN title
    ! Résultats trouvés
    Résultats to affiché From tipaul at users.sourceforge.net Thu Feb 19 11:26:41 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.fr,1.1.2.5,1.1.2.6 opac-css.fr,1.1.2.5,1.1.2.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24520/misc/translator Modified Files: Tag: rel_2_0 intranet.fr opac-css.fr Log Message: french translation file update Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** intranet.fr 10 Feb 2004 13:51:38 -0000 1.1.2.5 --- intranet.fr 19 Feb 2004 10:26:36 -0000 1.1.2.6 *************** *** 6,11 **** Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE - ACQUISITIONS ACQUISITIONS Acquisitions Acquisitions action=modrequest.pl method=post> ***** Active Actif --- 6,11 ---- Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE Acquisitions Acquisitions + ACQUISITIONS ACQUISITIONS action=modrequest.pl method=post> ***** Active Actif *************** *** 28,33 **** Add criteria Ajouter un critère Add currency Ajouter une monnaie - Add item Ajouter un ouvrage Add Item Ajouter un ouvrage Add item type Ajouter catégorie d'ouvrage Add member Ajouter un lecteur --- 28,33 ---- Add criteria Ajouter un critère Add currency Ajouter une monnaie Add Item Ajouter un ouvrage + Add item Ajouter un ouvrage Add item type Ajouter catégorie d'ouvrage Add member Ajouter un lecteur *************** *** 82,87 **** Alternative Phone Autre téléphone Ambrose Li ***** - Amount Montant AMOUNT MONTANT AMOUNT OWING Montant de l'avoir An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table Une "valeur autorisée": se réfère à une liste de valeurs autorisées pour ce sous-champs. Voir la table admin correspondante. --- 82,87 ---- Alternative Phone Autre téléphone Ambrose Li ***** AMOUNT MONTANT + Amount Montant AMOUNT OWING Montant de l'avoir An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table Une "valeur autorisée": se réfère à une liste de valeurs autorisées pour ce sous-champs. Voir la table admin correspondante. *************** *** 120,125 **** BARCODE CODE BARRE Barcode Code barre - BASKET PANIER Basket Panier Baycorp Adjustment ***** be in tab -1 être dans l'onglet -1 (items) --- 120,125 ---- BARCODE CODE BARRE Barcode Code barre Basket Panier + BASKET PANIER Baycorp Adjustment ***** be in tab -1 être dans l'onglet -1 (items) *************** *** 129,133 **** Become a Member S'inscrire Benedykt P. Barszcz (polish for 2.0 ***** - Benedykt P. Barszcz (polish for 2.0) UNUSED;1 Between Brothers by Irene Morck at Main Library ***** bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ***** --- 129,132 ---- *************** *** 153,161 **** Bookfund admin Admin Compte Bookshelves Rayonnages - Borrower Emprunteur borrower emprunteur Borrower categories Catégories d'emprunteurs - Borrower information Informations emprunteur Borrower Information Informations Emprunteur Borrowernumber N° Lecteur BORROWERS EMPRUNTEURS --- 152,160 ---- Bookfund admin Admin Compte Bookshelves Rayonnages borrower emprunteur + Borrower Emprunteur Borrower categories Catégories d'emprunteurs Borrower Information Informations Emprunteur + Borrower information Informations emprunteur Borrowernumber N° Lecteur BORROWERS EMPRUNTEURS *************** *** 174,179 **** Budget amount Montant budget budgetamount LIMITED;budgetamount ! Budgeted Cost Coûts budgetés ! Budgeted GST GST budgeté BUDGETED TOTAL TOTAL BUDGETE Budgets Budgets --- 173,178 ---- Budget amount Montant budget budgetamount LIMITED;budgetamount ! Budgeted Cost Coûts budgétés ! Budgeted GST TVA budgétée BUDGETED TOTAL TOTAL BUDGETE Budgets Budgets *************** *** 295,300 **** Define the categories of borrowers Définir catégories d'emprunteurs Del Suppr. - delete LIMITED;supprimer Delete LIMITED;Supprimer Delete a request by selecting "del" from the rank list Supprimer une demande en sélectionnant "suppr." dans la liste Delete Shelves Supprimer Rayonnages --- 294,299 ---- Define the categories of borrowers Définir catégories d'emprunteurs Del Suppr. Delete LIMITED;Supprimer + delete LIMITED;supprimer Delete a request by selecting "del" from the rank list Supprimer une demande en sélectionnant "suppr." dans la liste Delete Shelves Supprimer Rayonnages *************** *** 339,344 **** Enter Book Barcode Entrer Code barre du livre Enter borrower card number Entrer N° carte de lecteur - Error Erreur ERROR ERREUR ERROR : Barcode already exists ! ERREUR: Code barre existe déjà! Error Issuing Book Erreur prêt d'un livre --- 338,343 ---- Enter Book Barcode Entrer Code barre du livre Enter borrower card number Entrer N° carte de lecteur ERROR ERREUR + Error Erreur ERROR : Barcode already exists ! ERREUR: Code barre existe déjà! Error Issuing Book Erreur prêt d'un livre *************** *** 347,358 **** Ethnicity Notes Notes appartenance ethnique ex GST, inc discount ex TVA, remise - exact exact Exact Exact EXCHANGE RATES TAUX DE CHANGE Existing items Ouvrages existant Expiry Date Date d'expiration Explanation Explication - export LIMITED;exporter Export LIMITED;Exporter Export in MARC format the following biblios Exporter en format MARC les les biblios suivants Exporting in MARC format Exporter en format MARC --- 346,357 ---- Ethnicity Notes Notes appartenance ethnique ex GST, inc discount ex TVA, remise Exact Exact + exact exact EXCHANGE RATES TAUX DE CHANGE Existing items Ouvrages existant Expiry Date Date d'expiration Explanation Explication Export LIMITED;Exporter + export LIMITED;exporter Export in MARC format the following biblios Exporter en format MARC les les biblios suivants Exporting in MARC format Exporter en format MARC *************** *** 367,372 **** FINES & CHARGES AMENDES & FRAIS Firstname Prénom - FLAGS DRAPEAUX Flags Drapeaux Florian Bischof ***** for LIMITED;pour --- 366,371 ---- FINES & CHARGES AMENDES & FRAIS Firstname Prénom Flags Drapeaux + FLAGS DRAPEAUX Florian Bischof ***** for LIMITED;pour *************** *** 393,398 **** GROUP - GROUP - Group Number N° Groupe ! GST GST ! GST Registered GST enregistré Guarantees Garanties Guarantor Garant --- 392,397 ---- GROUP - GROUP - Group Number N° Groupe ! GST TVA ! GST Registered TVA à payer Guarantees Garanties Guarantor Garant *************** *** 443,447 **** Invalid cardnumber N° carte invalide Invoice Facture ! Invoice Item Price Includes GST Prix de la facture de l'ouvrage inclus le GST Invoice Number N° facture Invoice Prices are Prix facturés sont --- 442,446 ---- Invalid cardnumber N° carte invalide Invoice Facture ! Invoice Item Price Includes GST Prix de la facture de l'ouvrage inclus la TVA Invoice Number N° facture Invoice Prices are Prix facturés sont *************** *** 458,462 **** Issuing Question Question sur le prêt Item Ouvrage - Item () UNUSED;Ouvrage Item added with barcode Ouvrage ajouté avec un code barre Item Barcode Code barre d'un ouvrage --- 457,460 ---- *************** *** 472,476 **** Item types Categ. ouvrages Item waiting at Ouvrage en attente à - Item: () UNUSED;Ouvrage ItemNotes Notes ouvrage itemnum IGNORE --- 470,473 ---- *************** *** 530,538 **** Links Koha - MARC DB Liens Koha - base de données MARC Links to Associated Websites Liens vers des sites Web associés ! List Item Price Includes GST Prix catalogue de l'ouvrage inclus le GST List Prices are Prix catalogue sont Loan length Durée de prêt - Location Localisation LOCATION LOCALISATION Log In S'identifier Log Out Déconnecter --- 527,535 ---- Links Koha - MARC DB Liens Koha - base de données MARC Links to Associated Websites Liens vers des sites Web associés ! List Item Price Includes GST Prix catalogue de l'ouvrage inclus la TVA List Prices are Prix catalogue sont Loan length Durée de prêt LOCATION LOCALISATION + Location Localisation Log In S'identifier Log Out Déconnecter *************** *** 588,599 **** Michaes Herman ***** Michel Lerenard (Esiee School ***** - Michel Lerenard (Esiee School) UNUSED;1 Mike Hansen ***** Mike Johnson ***** Mike Mylonas ***** MJ Ray and Turo Technology LLP, england (quality control, installer & updater ***** - MJ Ray and Turo Technology LLP, england (quality control, installer & updater) UNUSED;1 - Modify Modifier modify modifier Modify a system preference Modifier une préférence système Modify category Modifier Catégorie --- 585,594 ---- Michaes Herman ***** Michel Lerenard (Esiee School ***** Mike Hansen ***** Mike Johnson ***** Mike Mylonas ***** MJ Ray and Turo Technology LLP, england (quality control, installer & updater ***** modify modifier + Modify Modifier Modify a system preference Modifier une préférence système Modify category Modifier Catégorie *************** *** 647,652 **** No. of Items Nombre d'ouvrages Non-Fiction Documentaire - normal normal Normal Normal Not for loan Non empruntable not imported because already in DB pas importé, car déjà existant dans la base de données --- 642,647 ---- No. of Items Nombre d'ouvrages Non-Fiction Documentaire Normal Normal + normal normal Not for loan Non empruntable not imported because already in DB pas importé, car déjà existant dans la base de données *************** *** 654,657 **** --- 649,653 ---- not imported because they seems not to be MARC format (or ISBN/ISSN missing) ! pas importé, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) ! Not on Issue Pas en prêt + Not Reservable ***** Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night Note : les amendes sont calculées par le misc/script fines2.pl. Demandez à votre administrateur de mettre ce script dans le crontab, après minuit, pour que les amendes soient calculées chaque nuit NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script Note : si vous changez quelque chose dans cette table, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl *************** *** 659,664 **** Note : the items are NOT exported by this tool Note: les ouvrages en sont PAS exportés par cet outil Note: in the last column, you can choose Note: dans la dernière colonne, vous pouvez choisir - NOTES NOTES Notes Notes nothing entered pas de saisie Nothing found Rien trouvé --- 655,660 ---- Note : the items are NOT exported by this tool Note: les ouvrages en sont PAS exportés par cet outil Note: in the last column, you can choose Note: dans la dernière colonne, vous pouvez choisir Notes Notes + NOTES NOTES nothing entered pas de saisie Nothing found Rien trouvé *************** *** 677,682 **** opac opac options >>   ***** - or ou OR OU OR Add to a new Group ou ajouter à un nouveau groupe OR MODIFY DETAILS ou modifie les détails --- 673,678 ---- opac opac options >>   ***** OR OU + or ou OR Add to a new Group ou ajouter à un nouveau groupe OR MODIFY DETAILS ou modifie les détails *************** *** 750,755 **** Publisher Editeur Publishers and Imprints Edition - QTY QUANTITE Qty Quantité Quantity Quantité Quantity Ordered Quantité commandée --- 746,751 ---- Publisher Editeur Publishers and Imprints Edition Qty Quantité + QTY QUANTITE Quantity Quantité Quantity Ordered Quantité commandée *************** *** 767,771 **** Receive Orders From Supplier Réceptionner commandes d'un fournisseur Received By Reçu par - Recherche ***** Recieved Reçu Record already in database Notice déjà existante --- 763,766 ---- *************** *** 792,799 **** Replacement Price Prix Remplacement Reporter Reporter - Reports LIMITED;Rapports reports LIMITED;rapports ! request LIMITED;Réservation Request LIMITED;Réservation Requested Reservé Requesting Reserve --- 787,794 ---- Replacement Price Prix Remplacement Reporter Reporter reports LIMITED;rapports ! Reports LIMITED;Rapports Request LIMITED;Réservation + request LIMITED;Réservation Requested Reservé Requesting Reserve *************** *** 819,824 **** Ron Wickersham ***** Rosalie Blake, Head of Libraries ***** - Save Enregistrer save Enregistrer Save Changes Enregistrer changements School Ecole --- 814,819 ---- Ron Wickersham ***** Rosalie Blake, Head of Libraries ***** save Enregistrer + Save Enregistrer Save Changes Enregistrer changements School Ecole *************** *** 872,876 **** SELECTED>traducteur ***** Serial Périodiques ! Series Séries Series Title Titre Séries Servers to query for MARC data serveurs à interroger pour des données MARC --- 867,871 ---- SELECTED>traducteur ***** Serial Périodiques ! Series Titre périodique ou collection Series Title Titre Séries Servers to query for MARC data serveurs à interroger pour des données MARC *************** *** 938,943 **** Tag LIMITED;Etiquette Teacher Reference Référence Enseignant - test test Test Test Text messaging Ecriture d'un texte Text Messaging Ecriture d'un texte --- 933,938 ---- Tag LIMITED;Etiquette Teacher Reference Référence Enseignant Test Test + test test Text messaging Ecriture d'un texte Text Messaging Ecriture d'un texte *************** *** 979,984 **** TITLE TITRE Title Search Recherche Titre - to ***** To LIMITED;à To "unmap", click ==> Pour "déconnecter" cliquer ==> To add a new biblio/item, scan or type the ISBN/ISSN number Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN. --- 974,979 ---- TITLE TITRE Title Search Recherche Titre To LIMITED;à + to ***** To "unmap", click ==> Pour "déconnecter" cliquer ==> To add a new biblio/item, scan or type the ISBN/ISSN number Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN. *************** *** 996,1001 **** Total Total TOTAL TOTAL - Total Due Total dû Total due Total dû Total Number of Items Nombre total d'ouvrages Total paid Total payé --- 991,996 ---- Total Total TOTAL TOTAL Total due Total dû + Total Due Total dû Total Number of Items Nombre total d'ouvrages Total paid Total payé *************** *** 1014,1019 **** unimarc_field_700_701_702.pl ***** Unititle Titre uniforme ! Update Mettre à jour ! update mettre à jour Update Member Details Mise à jour du lecteur Update this Website Link Corriger ce lien Internet --- 1009,1014 ---- unimarc_field_700_701_702.pl ***** Unititle Titre uniforme ! update LIMITED;mettre à jour ! Update LIMITED;Mettre à jour Update Member Details Mise à jour du lecteur Update this Website Link Corriger ce lien Internet *************** *** 1048,1053 **** Volume Description Description Volume Volume Info (for serials Info Volume (pour périodiques - WAITING EN ATTENTE Waiting En attente Website Site Web Website Biblioitem Added Notice site Web ajoutée --- 1043,1048 ---- Volume Description Description Volume Volume Info (for serials Info Volume (pour périodiques Waiting En attente + WAITING EN ATTENTE Website Site Web Website Biblioitem Added Notice site Web ajoutée *************** *** 1063,1068 **** Year Année Yes Oui - yes oui YES OUI Yes, See below Oui, voir plus bas YesNo OuiNon --- 1058,1063 ---- Year Année Yes Oui YES OUI + yes oui Yes, See below Oui, voir plus bas YesNo OuiNon *************** *** 1077,1082 **** You must create a new group for your item to be added to Vous devez créer un nouveau groupe pour ajouter vos ouvrages You must give the item a barcode Vous devez attribuer un code barre à l'ouvrage - You searched for Votre recherche sur You Searched for Votre recherche sur You searched on Recherche effectuée sur Young Adult Fiction Fiction Ados --- 1072,1077 ---- You must create a new group for your item to be added to Vous devez créer un nouveau groupe pour ajouter vos ouvrages You must give the item a barcode Vous devez attribuer un code barre à l'ouvrage You Searched for Votre recherche sur + You searched for Votre recherche sur You searched on Recherche effectuée sur Young Adult Fiction Fiction Ados Index: opac-css.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac-css.fr,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** opac-css.fr 10 Feb 2004 09:02:53 -0000 1.1.2.5 --- opac-css.fr 19 Feb 2004 10:26:37 -0000 1.1.2.6 *************** *** 97,101 **** normal normal Normal or Normal ou ! Not Reservable Non réservable Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used Notez que le mot clef est prioritaire Note there will be a reserve charge of Il y aura des frais de réservation de --- 97,101 ---- normal normal Normal or Normal ou ! Not Reservable A consulter sur place Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used Notez que le mot clef est prioritaire Note there will be a reserve charge of Il y aura des frais de réservation de From oleonard at users.sourceforge.net Thu Feb 19 19:56:24 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:56:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27625/npl Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:57:10 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:57:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27745/en Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/acqui Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/acqui.simple Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/catalogue Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/includes Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/parameters Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/circ Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:11 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/user - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/user Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/user added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/marcimport - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/marcimport Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/reports Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/import - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/import Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:11 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/value_builder - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/value_builder Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/members Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:12 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/search.marc Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:12 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/z3950 - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/z3950 Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/export - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/export Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:59:39 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:59:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,NONE,1.1 acquire.tmpl,NONE,1.1 basket.tmpl,NONE,1.1 newbasket.tmpl,NONE,1.1 newbasket2.tmpl,NONE,1.1 newbiblio.tmpl,NONE,1.1 order.tmpl,NONE,1.1 recieve.tmpl,NONE,1.1 recieveorder.tmpl,NONE,1.1 supplier.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28315/koha-tmpl/intranet-tmpl/npl/en/acqui Added Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket.tmpl newbasket2.tmpl newbiblio.tmpl order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl Log Message: New NPL templates --- NEW FILE ---

    Acquisitions

    Start, Recieve, or Modify Any Order
    Receive or Modify a Periodical Order
    Exchange Rates
    " name="" value="">
    Budgets and Bookfunds
    Budgets Total Spent Comtd Avail
    Total

    Use your reload button [ctrl + r] to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.

    Help

    To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

    To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

    To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

    To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

    --- NEW FILE ---

    Receipt Summary for : Invoice,

    • Invoice:
    • Received By:
    • Date:

    - Receive Order

    • Shopping Basket For:
    • Order placed:
    Catalogue Details
    Title * " >
    Author " >
    Copyright Date " >
    Format
    ISBN ">
    Series ">
    Branch
    Item Barcode * ">
    Volume Info (for serials) *
    "> "> "> "> "> "> &id=">Edit
    Accounting Details
    Bookfund *
    Quantity Ordered ">
    Quantity Received * ">
    Replacement Cost ">
    Budgeted Cost ">
    Actual Cost * ">
    Invoice Number ">
    Notes ">
    Basket ISBN Title Author Qty Received
    &biblio=&invoice=&freight=&gst=&id=">
    --- NEW FILE ---

    Shopping Basket for ">

    (Our Reference: , #, authorised by: )

    "> " /> " />
    Order Isbn Title Author $ rrp $est Qty Total
    &id=&basket=">
    HELP

    To change any of the catalogue or accounting information attached to an order, click on the title.

    		 SubTotal
    GST
    TOTAL

    " /> " /> Add order : enter keyword or title:

    --- NEW FILE --- Shopping Basket for
    (Our Reference: , #, authorised by: )
    Ph: , Fax:
    ,
    ,

    "> "> Search Keyword or Title:
    >
    Order Isbn Title Author Qty
    --- NEW FILE ---

    Shopping Basket For:

    &basket=&sub=">Add New Biblio &basket=&sub=">Add New Biblio | ">View Basket |
    " /> " /> New Search:

    You searched for

    --- NEW FILE ---
    --> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />

    - Order Details

    Shopping Basket For:

    ">View Basket
    Catalogue Details
    Title * " />
    Author " />
    Copyright Date " />
    Format
    ISBN ">
    Series ">
    Branch
    Accounting Details
    Quantity " onchange="update(this.form)" />
    Bookfund
    Suppliers List Price " onchange="update(this.form)" />
    Replacement Cost
    		" onchange="update(this.form)" />
    Budgeted Cost
    (ex GST, inc discount)     		" onchange="update(this.form)" />
    Budgeted GST
    BUDGETED TOTAL
    Actual Cost
    Invoice Number *
    Notes " />

    HELP

    • Bold fields must be filled in to create a new bibilo and item.

    • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.
    --- NEW FILE ---
    You searched on supplier , results found
    Supplier Search Results
    Order Receive Company
    Basket Items Staff Date
    /images/mail_send.png" title="Add order" ALT="Add" border="0" > /images/mail_get.png" title="receive" ALT="Add" border="0" >
    ">
    --- NEW FILE ---

    Receipt Summary for : , Invoice

    • Invoice:
    • Received By:
    • Date:
    " /> " /> " /> " /> Search ISBN or Title:
    Basket ISBN Title Author Actual P&P Qty Total
    &biblio=&invoice=&gst=&freight=&id="> $   $
          Subtotals $ $
    HELP

    The total at the bottom of the page should be within a few cents of the total for the invoice.

    When you have finished this invoice save the changes.

    		 GST $
      TOTAL $
    --- NEW FILE ---

    Receive Orders From Supplier

    " />
    Supplier Invoice Information
    Supplier Invoice Number
    GST
    Freight
    --- NEW FILE ---
    >

    Update:

    Add supplier

    Company Details
    " />
    " />
    " />
    " />
    Contact Details
    " />
    " />
    " />
    " />
    " />
    " />
    Current Status
    checked="checked" />Active checked="checked" />Inactive
    Ordering Information
    checked="checked" />Yes checked="checked" />No
    checked="checked" />Yes checked="checked" />No
    checked="checked" />Yes checked="checked" />No
    " /> %
    From oleonard at users.sourceforge.net Thu Feb 19 20:02:15 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:02:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,NONE,1.1 catalogue-home.tmpl,NONE,1.1 cmsdsearchresults.tmpl,NONE,1.1 detail-opac.tmpl,NONE,1.1 detail.tmpl,NONE,1.1 detailprint.tmpl,NONE,1.1 moredetail.tmpl,NONE,1.1 searchresults.tmpl,NONE,1.1 subject.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28745/koha-tmpl/intranet-tmpl/npl/en/catalogue Added Files: MARCdetail.tmpl catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl detailprint.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Log Message: New NPL templates --- NEW FILE --- --- NEW FILE ---

    Catalogue Search

    Search by Number

    Barcode
    ISBN

    Search by Details

    Keywords
    Title
    Author
    Collection
    Branch
    Pub Date(before) (after)
    Search TypeNormal Exact

    Search by Subject

    Subject
    --- NEW FILE --- Search Results
    TitleAuthorDewey
    &startfrom=>Previous Records &startfrom=>Next Records

    Results through of records.
    --- NEW FILE --- ()

    BIBLIO RECORD

    Subtitle:
    Author:
    Additional Author:
    Series Title:
    Subject:
    Copyright:
    Notes:
    Unititle:
    Serial:
    Total Number of Items:

    Item Type Class Location Date Due Last Seen
    Website Online Available &bib=&bi=">http://


    --- NEW FILE ---

    .jpg" alt="Book Cover Image" />

    ()

    Biblio Record

    " />
    " />" />" />" />
    " name="bib" />
    • Subtitle:
    • Author: ">
    • Additional Author:
    • ISBN:
    • Series Title:
    • Copyright:
    • Notes:
    • Unititle:
    • Serial:
    • Total Number of Items:
    • Subject: ">
      -->
    Item Type Call Number Location Date Due Last Seen Barcode
    "> -->  &item=&bib=&bi=#"> &item=">Fix Itemtype
    Website Online Available &bib=&bi=">http://

    Links to Associated Websites
    Title:
    Description:
    URL:">http://
    -->

    --- NEW FILE ---
      
    Biblio Record Number:
    Author:
    Additional Author:
    Publisher:
    Publication Details: , ,
    Collection:
    Subject:
    Copyright Date:
    Notes:
    Unititle:
    Dewey: ">
    Classification:
    LCCN:
    URL: ">
    ISBN:
    Item TypeBranchBarcode
    ,  
    --- NEW FILE ---

    ()

    Biblio Number:

    Category:

    " name="bib" />
    " />
    -->
    Bibliographic Details
    Biblionumber:
    Item Type:
    URL: -->
    Loan Length:
    Classification:
    ISBN:
    Publisher:
    Place:
    Date:
    Volume:
    Pages:
    Illus:
    Size:
    Notes:
    No. of Items:
    " id="">

    Barcode:

    Home Branch:
    Last seen:
    On loan to:
    Last borrowed:
    Last Borrower 1: ">
    Last Borrower 2: ">
    Current Branch:
    Replacement Price:
    &item=&type=">Item lost:
    Paid for:
    Notes:
    Renewals:
    &biblio=&invoice=&catview=yes"> Accession Date:
    Withdrawn:
    &bi=&itm=">Total Issues: 
    Group Number:
    Biblio number:
    --- NEW FILE ---

    You searched for You did not specify any seach criteria

     
    Results through of records.
    TitleAuthor©Call NumberItem CountLocation  
    opacintra&bib="> () &type=opacintra">          ">Reserves
    &=&type=opacintra"><<Prev   &=&type=opacintra">   &=&type=opacintra">Next >>  
    Results through of records. Try another search
    Try another search
    --- NEW FILE ---
    Results through of records.
    Subject
    opacintra&subjectitems=">
    "><< Previous Records &startfrom=">Next Records >>
    Results through of records.
    From oleonard at users.sourceforge.net Thu Feb 19 20:03:01 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:03:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,NONE,1.1 circulation.tmpl,NONE,1.1 returns.tmpl,NONE,1.1 selectbranchprinter.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28887/koha-tmpl/intranet-tmpl/npl/en/circ Added Files: branchtransfers.tmpl circulation.tmpl returns.tmpl selectbranchprinter.tmpl Log Message: New NPL templates --- NEW FILE --- Koha -- Circulation: Transfers

    Circulation: Transfers

    Reserve Found

    Reserve found for (" onclick="openWindow(this,'Member', 480, 640)">). Item is marked waiting at for (" onclick="openWindow(this,'Member', 480, 640)">).
    Set reserve to waiting and transfer book to : Cancel reservation and then attempt transfer:
    " value="" /> " value="" /> " value="" /> " /> " /> " />
    Cancel reservation and then attempt transfer:
    " value="" /> " value="" /> " value="" /> " /> " /> " /> />
    Ignore and return to transfers:
    /> " value="" /> " value="" /> " value="" />
    Messages
    Reserve Cancelled
    Item should now be waiting at branch:
    No Item with barcode: Please return item to home branch: Item is already at destination branch. Item was on loan to " onClick="openWindow(this,'Member', 480, 640)"> and has been returned.

    Transfer

    Destination Branch:
    Enter Book Barcode
    " /> " value="" /> " value="" /> " value="" />
    Transfered Items
    Bar CodeTitleAuthorTypeFromTo
    &type=intra" onclick="openWindow(this, 'Item', 480, 640)">
    --- NEW FILE ---

    Circulation: Issues

    Issuing Question

    Attempting to issue by to .

    " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />
    " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />

    Error Issuing Book

    Add a new patron

    " /> " />

    Patron not found? Add a new patron

    " /> " />

    ()


    Reserves waiting:
    Notes:
    > Sticky Due Date --> " /> " /> " /> " />
    " />
    Issues ">(Print Page) ">(Print Slip)
    Due DateTitleAuthorCall NoBarcodeRenew?
    &type=intra"> " value="y" />
    &type=intra"> " value="y" />

    " />" value="y" />
    --- NEW FILE --- Koha -- Circulation: Returns:

    Reserve Found (item is already marked waiting)

    ">
    Patron:
    Transfer to:
    " value="" /> " value="" /> " value="" />

    Item marked Waiting:


    ">
    Patron:
    " value="" /> " value="" /> " value="" />
    ">
    Patron:
    Transfer to:
    " value="" /> " value="" /> " value="" /> " /> " /> " />

    Circulation: Returns

    " value="" /> " value="" /> " value="" />
    No Item with barcode: Please return to Not On Issue. Item was lost, now found. Item Cancelled
    Item InformationBorrower Information
    "> , ( , )
    Returned Items
    Due DateBar CodeTitleAuthorTypeBorrower
    // Not on Issue. &type=intra"> ">
    --- NEW FILE --- Koha -- Circulation: Select Your Home Branch

    Circulation: Select Your Home Branch

    From oleonard at users.sourceforge.net Thu Feb 19 20:06:48 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:06:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/export marc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/koha-tmpl/intranet-tmpl/npl/en/export Added Files: marc.tmpl Log Message: New NPL templates --- NEW FILE ---

    MARC Export

    Export in MARC format the following biblios:

    From biblio number: to biblio number:

    (leave blank to export every biblio)

    Note : the items are NOT exported by this tool

    From oleonard at users.sourceforge.net Thu Feb 19 20:08:20 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:08:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/import breeding.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29888/koha-tmpl/intranet-tmpl/npl/en/import Added Files: breeding.tmpl Log Message: New NPL templates --- NEW FILE ---

    MARC acquisition system

    Import into the breeding farm

    Import results :

    • imported records
    • not imported because already in DB
    • not imported because already in farm
    • not imported because they seems not to be MARC format (or ISBN/ISSN missing) !
    • records parsed
    • Back
    • 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.
    • If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.
    • You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!
    • Of course, if the ISBN already exists in the active DB, the biblio will be ignored.
    " enctype="multipart/form-data">

    If ISBN already in breeding farm: Ignore this one, keep the existing one
    Overwrite the existing one with this
    From oleonard at users.sourceforge.net Thu Feb 19 20:11:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:11:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes admin-topmenu.inc,NONE,1.1 circ-topmenu.inc,NONE,1.1 doc-head-circ-close.inc,NONE,1.1 doc-head-circ-open.inc,NONE,1.1 intranet-bottom.inc,NONE,1.1 intranet-nav-brief.inc,NONE,1.1 intranet-nav.inc,NONE,1.1 intranet-topmenu.inc,NONE,1.1 intranet.css,NONE,1.1 itemtypes.js,NONE,1.1 main-top-addbiblio.inc,NONE,1.1 main-top-blank.inc,NONE,1.1 main-top-circ.inc,NONE,1.1 main-top-print.inc,NONE,1.1 main-top.inc,NONE,1.1 masthead.inc,NONE,1.1 members-topmenu.inc,NONE,1.1 print.css,NONE,1.1 rollovers.js,NONE,1.1 tabs.css,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30391/koha-tmpl/intranet-tmpl/npl/en/includes Added Files: admin-topmenu.inc circ-topmenu.inc doc-head-circ-close.inc doc-head-circ-open.inc intranet-bottom.inc intranet-nav-brief.inc intranet-nav.inc intranet-topmenu.inc intranet.css itemtypes.js main-top-addbiblio.inc main-top-blank.inc main-top-circ.inc main-top-print.inc main-top.inc masthead.inc members-topmenu.inc print.css rollovers.js tabs.css Log Message: New NPL templates --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- </body> </html> --- NEW FILE --- <div id="nav"> <ul> <li><h4>Koha</h4></li> <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li> <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a> </li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li> <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Advanced Search</a></li> <li><a href="/cgi-bin/koha/search.marc/searchSH.pl?type=intranet">Thorough Search</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">MARC Search</a></li> </ul></li> <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a></li><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li> </ul> </div> --- NEW FILE --- <div id="nav"> <ul> <li><h4>Koha</h4></li> <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li> <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a> <form method="post" action="/cgi-bin/koha/circ/circulation.pl"> <label for="findborrower">Issue to:</label> <input id="findborrower" name="findborrower" type="text" size="10" /> <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /> <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input type="submit" class="submit" value="Submit" /> </form></li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a> </li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li> <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/member.pl" method="post"> <label for="member">Search:</label><input id="member" type="text" size="10" name="member" /> <input type="submit" value="Search" class="submit" /> </form></li></ul></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Catalog</a><ul><li><form action="/cgi-bin/koha/search.pl" method="post"> <label for="keyword">Quick Search:</label><input id="keyword" type="text" size="10" name="keyword" /> <input type="submit" value="Search" class="submit" /> </form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Advanced Search</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">MARC Search</a></li> </ul></li> <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li> <li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a> <ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul> </li> </ul> </div> --- NEW FILE --- <div id="topmenu"><form action="/cgi-bin/koha/member.pl" method="post"> <label for="member">Patron Search</label> <input type="text" id="member" name="member" value="" /> <input type="submit" class="submit" name="Go" value="Search" /></form><form action="/cgi-bin/koha/simpleredirect.pl" method="post"> <input type="submit" class="submit" value="Add New Patron" /> <input type="hidden" name="chooseform" value="adult" /> </form></div> --- NEW FILE --- a:link { color : #0066CC; } a:visited { color : #0066CC; } a:hover { color : #993300; } a.delete { background-color : #CC3333; color : #FFFF99; display : block; font-weight : bold; margin : 2px; padding : 1px; text-align : center; text-decoration : none; } a.delete:hover { background-color : #FF3333; color : #FFFF99; } a.edit { background-color : #CCFF00; color : #3366CC; display : block; font-weight : bold; margin : 2px; padding : 1px; text-align : center; text-decoration : none; } a.edit:hover { background-color : #CCFF99; color : #000088; } a:link.current { background-color : transparent; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:link.current { background-color : transparent; color : #3366CC; } a:link.nav { background-color : #D8DEB8; color : #3366CC; } a:link.pages { background-color : #FFFFCC; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:visited.current { background-color : transparent; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:visited.current { background-color : transparent; color : #3366CC; } a:visited.nav { background-color : #D8DEB8; color : #3366CC; } a:visited.pages { background-color : #FFFFCC; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:hover.current { background-color : #CCFF00; color : #CC3333; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:hover.current { background-color : #CCFF00; color : #CC3333; } a:hover.nav { background-color : #CCFF00; color : #CC3333; } a:hover.pages { background-color : #CCFF00; color : #CC3333; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:active.current { background-color : #99CC00; color : #FFFF99; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:active.current { background-color : #99CC00; color : #FFFF99; } a:active.nav { background-color : #99CC00; color : #FFFF99; } a:active.pages { background-color : #99CC00; color : #FFFF99; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } body { background-color : #009999; color : #333333; font-family : arial, geneva, sans-serif; font-size : 16px; margin : 3px 0px 0px 5px; } caption { color : #000066; font-size : 16px; font-weight : bold; margin-top : 5px; text-align : left; } div.form, div.details { background-color : #FFFFCC; border : 0px; margin : 0px auto; padding : 5px; width : 99%; } div.details { margin-bottom: 5px; width : 95%; } div.details dl { margin : 0px; padding : 0px; } div.details dt { font-weight: bold; font-size: 12px; border-bottom : 1px solid #D8DEB8; padding : 2px; } div.details dd { font-size: 12px; } div.details ul { margin-top: 0px; margin-bottom: 0px; padding-top : 0px; padding-bottom : 3px; font-size : 12px; } div.items { background-color : #FFFFCC; border : 0px; margin : 0px auto; padding : 5px; width : 100%; } div.items td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 1px solid #E7E7CA; border-top : 1px solid #E7E7CA; font-size : .75em; padding: 2px; } div.items th { background-color : #FFC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 1px solid #E7E7CA; color : #000088; font-size: .75em; font-weight : bold; padding : 2px; text-align : left; vertical-align : top; } div.details td, div.form td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; } div.details td:first-child, div.form td:first-child { font-weight : bold; text-align : right; width : 25%; } div.details td+td, div.form td+td { font-weight : normal; text-align : left; width : 75%; } div.compact td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; font-weight : normal; font-size : 13px; padding : 1px 1px 1px 10px; } div.compact th { border-bottom : 1px solid #999933; border-left : 1px solid #E7E7CA; border-right : 1px solid #999933; border-top : 0px; padding : 1px 10px 1px 1px; font-weight : normal; font-size : 13px; text-align : right; width : 20%; vertical-align: top; } div.error { background-color : #FFFF99; border : 1px dashed #990000; font-size : 16px; line-height : 18px; margin : 10px auto; padding : 5px; width : 65%; } div.error .submit { background-color : #993300; font-size: 14px; color: #E7E7CA; padding : 2px 15px 2px 15px; } div.error h3 { color : #990033; } div.error p { margin : 0px; padding : 0px 0px 0px 20px; } div.notice { background-color : #FFFF99; border : 1px dashed #990000; font-size : 16px; line-height : 18px; margin : 10px auto; padding : 5px; } div.flags li { list-style : circle; } div.flags ul { margin : 0px; padding : 0px; } div.form { background-color : #FFFFCC; border : 0px dotted #333333; margin : 0px auto; padding : 5px; position : relative; } div.menu { width : 100%; } div.menu th { background-color : #FFFFCC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; font-size : 101%; font-weight : bold; text-align : right; } div.menu td+td { font-size : 90%; font-weight : normal; text-align : left; } div.tabitem { display : inline; } div.tabitem form { display : inline; white-space : nowrap; } div.tabitem ul li { margin-left: 0; margin-bottom: 0; padding: 2px 15px 5px; border: 1px solid #000; list-style: none; display: inline; } div.tabitem ul li.here { border-bottom: 1px solid #ffc; list-style: none; display: inline; } div.table, div.form { width : 100%; } fieldset { border : 0; padding : 0; white-space : nowrap; } fieldset.list { white-space : normal; } form { margin : 0px; padding : 0px; } h1 { color : #000066; font-size : 20px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h2 { color : #000066; font-size : 18px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3 { color : #000066; font-size : 16px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3.alert { background-color: #FFCC33; color: #CC0000; padding: 3px; } h4 { color : #000066; font-size : 14px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h5 { color : #000066; font-size : 13px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } h6 { color : #000066; font-size : 12px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } label { font-weight : bold; padding : 0px 5px 0px 5px; } table { background-color : #FFFFCC; border-bottom : 0px solid #000000; border-collapse : collapse; border-left : 0px solid #000000; margin : 3px 0px 5px 0px; padding : 0px; width : 99%; } td { border-bottom : 1px solid #E7E7CA; border-right : 1px solid #E7E7CA; font-size : 12px; padding : 5px 5px 5px 5px; } td:last-child { border-bottom : 1px solid #E7E7CA; border-right : 0px solid #E7E7CA; font-size : 12px; padding : 5px 5px 5px 5px; } td+ul { margin-top : 0px; margin-bottom : 0px; } th { background-color : #D8DEB8; border-bottom : 1px solid #000000; border-right : 1px solid #000000; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } th:last-child { background-color : #D8DEB8; border-bottom : 1px solid #000000; border-right : 0px solid #000000; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } td.input, div.form td, div.details td { border-bottom : 1px solid #E7E7CA; border-left : 0px; border-right : 0px; color : #000000; line-height : 1.5em; padding : 4px; text-align : right; } td.label, div.form th, div.details th { background-color : #FFC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; text-align : left; vertical-align : top; } td.label { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; } tr.highlight { background-color : #FFFFFF; } /*.barcode { display : block; text-align : right; font-style: italic; font-size : .95em; color: #666633; }*/ .cancel { background-color : #993300; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .current { background-color : #FFFFFF; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } .error { color : #CC0033; font-weight : bold; } .ex { font-family : "Courier New", Courier, monospace; } .form dd { border-bottom : 1px solid #E7E7CA; color : #000000; display : block; line-height : 1.5em; padding : 4px; text-align : right; } .form dl { margin : 0px 0px 0px 0px; padding : 3px; width : 80%; } .form dt { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; color : #000088; float : left; font-weight : bold; line-height : 1.5em; padding : 4px; } .inline { display : inline; } .menu input { font-size : 80%; } input.focus { background-color: #FFF; border-bottom: 2px dashed #993300; } input.unfocus { background-color : #FFF; } .nav { font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } .print { font-size: 10px; } .submit { background-color : #669999; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .yes { float: left; padding : 0px 15px 0px 15px; width : 33%; margin : 0px 2px 0px 2px; text-align: center; } .no { float: right; padding : 0px 15px 0px 15px; width : 33%; margin : 0px 2px 0px 2px; text-align: center; } #main { background-color : #CCCC99; border-left : 1px solid #CCCC99; margin-left : 20%; margin-right : 2%; margin-top : 2%; padding : 10px; position : relative; } #menu { background-color : #FFFFCC; } #menu dd { border-bottom : 1px dashed #D8DEB8; border-left : 1px dashed #D8DEB8; border-right : 0px solid #000000; border-top : 0px solid #000000; padding : 3px 45px 3px 10px; } #menu dd a { font-size : 1.05em; font-weight : bold; text-decoration : none; } #menu dd li { display : inline; white-space : nowrap; } #menu dd li:before { content : "\00BB \0020"; } #menu dd ul { display : inline; list-style : disc; } #menu dl { margin : 0px; padding : 0px; /*width : 80%;*/ } #menu dt { background-color : #FFFFFF; border-bottom : 1px solid #D8DEB8; border-left : 0px solid #D8DEB8; border-right : 0px solid #000000; border-top : 0px solid #000000; color : #000066; font-size : 1.2em; font-weight : bold; padding : 2px 2px 2px 5px; } #menu dt a { text-decoration : none; } #nav { background-color : #CCCC99; float : left; margin : 2% 0% 0% 1%; padding : 0px; width : 15%; } #nav .submit { font-size : 9px; } #nav a { font-family : Tahoma, arial, geneva, sans-serif; font-weight : bold; text-decoration : none; } #nav h4 { font-size : 12px; font-weight : bold; margin : 0px; padding : 0px; text-align : left; } #nav input { font-size : .8em; } #nav label { font-size : 10px; } #nav ul { margin : 0px; padding : 0px; } #nav ul li { background-color : #D8DEB8; border-bottom : 1px solid #FFFFCC; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; border-top : 0px solid #FFFFCC; font-size : .8em; list-style : none; padding : 3px; text-align : right; width : 100%; } #nav ul li+li { border-bottom : 1px solid #FFFFCC; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; } #nav ul ul { margin : 0px 0px 0px 5px; } #nav ul ul li { background-color : #EFF1D8; border-bottom : 1px solid #CCCC99; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; border-top : 0px solid #FFFFCC; font-size : .9em; list-style : none; margin : 0px 0px 0px 0px; padding : 0px 0px 0px 0px; text-align : right; width : 100%; } #nav ul ul li+li { border-bottom : 1px solid #CCCC99; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; padding : 0px 0px 0px 0px; } #notes { float : right; margin : 0px; font-size : 12px; } #notes ul { margin : 0px; padding : 0px; } #results, .results { color : #000066; font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; font-size : .8em; margin : 0px; padding : 3px 0px 15px 0px; } #topmenu { color : #CCCC99; margin-bottom : 5px; margin-left : 20px; margin-right : 10px; } #topmenu .submit { background-color : #999933; color : #FFFFCC; font-size : .7em; padding : 2px; } #topmenu a:link { color : #CCFF66; font-weight : bold; padding : 2px; } #topmenu a:visited { color : #CCFF66; font-weight : bold; padding : 2px; } #topmenu a:hover { color : #FFFFCC; font-weight : bold; padding : 2px; } #topmenu a:active { color : #FFFFCC; font-weight : bold; padding : 2px; } #topmenu form { display : inline; } #topmenu label { font-weight : bold; } --- NEW FILE --- <script language="JavaScript" type="text/javascript"> // function isNotNull(f,noalert) { if (f.value.length ==0) { return false; } return true; } // function toUC(f) { var x=f.value.toUpperCase(); f.value=x; return true; } // function isNum(v,maybenull) { var n = new Number(v.value); if (isNaN(n)) { return false; } if (maybenull==0 && v.value=='') { return false; } return true; } // function isDate(f) { var t = Date.parse(f.value); if (isNaN(t)) { return false; } } // function Check(f) { var ok=1; var _alertString=""; var alertString2; if (f.itemtype.value.length==0) { _alertString += "- itemtype missing\n"; } if (!(isNotNull(window.document.Aform.description,1))) { _alertString += "- description missing\n"; } if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) { _alertString += "- loan length is not a number\n"; } if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) { _alertString += "- rental charge is not a number\n"; } if (_alertString.length==0) { document.Aform.submit(); } else { alertString2 = "Form not submitted because of the following problem(s)\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; alertString2 += _alertString; alert(alertString2); } } </script> --- NEW FILE --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE ---

    Koha Intranet:

    --- NEW FILE ---
    Patrons Home |
     
    --- NEW FILE --- a:link { color : #000066; text-decoration: none; } a:visited { color : #000066; text-decoration: none; } a:hover { color : #993300; text-decoration: none; } body { background-color : #FFF; color : #333333; font-family : arial, geneva, sans-serif; font-size : 14px; margin : 0px 0px 0px 0px; } caption { color : #000066; font-size : 18px; font-weight : bold; margin-top : 5px; text-align : left; } div.table { width : 100%; } form { margin : 0px; padding : 0px; } h1 { color : #000066; font-size : 22px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h2 { color : #000066; font-size : 20px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3 { color : #000066; font-size : 18px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h4 { color : #000066; font-size : 16px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h5 { color : #000066; font-size : 15px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } h6 { color : #000066; font-size : 14px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } table, table.list { background-color : #FFFFFF; border-bottom : 0px solid #CCCCCC; border-collapse : collapse; border-left : 0px solid #CCCCCC; margin : 3px 0px 5px 0px; padding : 0px; width : 99%; } td { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-right : 1px solid #CCCCCC; font-size : 12px; padding : 5px 5px 5px 5px; } td:last-child { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-right : 0px solid #CCCCCC; font-size : 12px; padding : 5px 5px 5px 5px; } table.list th { background-color : #FFFFFF; text-align: left; font-size: 12px; font-weight: bold; padding: 5px; width : 25%; } th { background-color : #E9E9E9; border-bottom : 1px solid #CCCCCC; border-right : 1px solid #CCCCCC; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } th:last-child { background-color : #E9E9E9; border-bottom : 1px solid #CCCCCC; border-right : 0px solid #CCCCCC; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } td.input, div.form td, div.details td { border-bottom : 1px solid #CCCCCC; border-left : 0px; border-right : 0px; color : #000000; line-height : 1.5em; padding : 4px; text-align : left; } td.label, div.form th, div.details th { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-left : 1px solid #CCCCCC; border-right : 0px; border-top : 0px; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; text-align : right; vertical-align : top; } tr.highlight { background-color: #CCCCCC; } .cancel { background-color : #993300; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .error { font-weight: bold; } .ex { font-family : "Courier New", Courier, monospace; } .inline { display : inline; } .print { display : none; } .submit { background-color : #669999; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } #main { background-color : #FFF; border-left : 0px solid #CCCC99; margin-left : 2%; margin-right : 2%; margin-top : 1%; padding : 5px; position : relative; } --- NEW FILE --- if (document.images) { home0 = new Image(); home0.src = "/intranet-tmpl/npl/en/images/home0.gif"; library0 = new Image(); library0.src = "/intranet-tmpl/npl/en/images/library0.gif"; kids0 = new Image(); kids0.src = "/intranet-tmpl/npl/en/images/kids0.gif"; teens0 = new Image(); teens0.src = "/intranet-tmpl/npl/en/images/teens0.gif"; readers0 = new Image(); readers0.src = "/intranet-tmpl/npl/en/images/readers0.gif"; search0 = new Image(); search0.src = "/intranet-tmpl/npl/en/images/search0.gif"; branch0 = new Image(); branch0.src = "/intranet-tmpl/npl/en/images/branch0.gif"; programs0 = new Image(); programs0.src = "/intranet-tmpl/npl/en/images/programs0.gif"; mobile0 = new Image(); mobile0.src = "/intranet-tmpl/npl/en/images/mobile0.gif"; OPLIN0 = new Image(); OPLIN0.src = "/intranet-tmpl/npl/en/images/OPLIN0.gif"; contact0 = new Image(); contact0.src = "/intranet-tmpl/npl/en/images/contact0.gif"; home1 = new Image(); home1.src = "/intranet-tmpl/npl/en/images/home1.gif"; library1 = new Image(); library1.src = "/intranet-tmpl/npl/en/images/library1.gif"; kids1 = new Image(); kids1.src = "/intranet-tmpl/npl/en/images/kids1.gif"; teens1 = new Image(); teens1.src = "/intranet-tmpl/npl/en/images/teens1.gif"; readers1 = new Image(); readers1.src = "/intranet-tmpl/npl/en/images/readers1.gif"; search1 = new Image(); search1.src = "/intranet-tmpl/npl/en/images/search1.gif";; branch1 = new Image(); branch1.src = "/intranet-tmpl/npl/en/images/branch1.gif"; programs1 = new Image(); programs1.src = "/intranet-tmpl/npl/en/images/programs1.gif"; mobile1 = new Image(); mobile1.src = "/intranet-tmpl/npl/en/images/mobile1.gif"; OPLIN1 = new Image(); OPLIN1.src = "/intranet-tmpl/npl/en/images/OPLIN1.gif"; contact1 = new Image(); contact1.src = "/intranet-tmpl/npl/en/images/contact1.gif"; } // Function to 'activate' images. function imgOn(imgName) { if (document.images) { document[imgName].src = eval(imgName + "0.src"); } } // Function to 'deactivate' images. function imgOff(imgName) { if (document.images) { document[imgName].src = eval(imgName + "1.src"); } } --- NEW FILE --- .contentholder { position: relative; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; } .tabholder { margin-top : 5px; padding: 0; position: relative; z-index: 2; } .tab { border: 2px; border-color: #999999; border-bottom-style: none; line-height: 150%; text-align: center; padding: 4px 10px 4px 10px; margin: 0; cursor: pointer; cursor: hand; font-family: Arial, Helvetica, sans-serif; font-size: 12px; font-weight: bold; background-color: #D8DEB8; color: #000066; } .panelholder { position: relative; top: 3px; z-index: 1; width: 100%; visibility: visible; display: block; } .panel { position: relative; color: #000000; background-color: #FFFFCC; border: 2px; border-color: #999999; top: 0; left: 0; padding: 10px; display: none; } From oleonard at users.sourceforge.net Thu Feb 19 20:11:58 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:11:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/marcimport AcceptBiblioitem.tmpl,NONE,1.1 AcceptItemCopy.tmpl,NONE,1.1 AcceptMarcUpload.tmpl,NONE,1.1 ListFileRecords.tmpl,NONE,1.1 mainmenu.tmpl,NONE,1.1 marcimportdetail.tmpl,NONE,1.1 uploadmarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30588/koha-tmpl/intranet-tmpl/npl/en/marcimport Added Files: AcceptBiblioitem.tmpl AcceptItemCopy.tmpl AcceptMarcUpload.tmpl ListFileRecords.tmpl mainmenu.tmpl marcimportdetail.tmpl uploadmarc.tmpl Log Message: New NPL templates --- NEW FILE ---
    New Record | New File
    Record already in database
    is already in the database with biblionumber and biblioitemnumber

    Record entered into database
    has been entered into the database with biblionumber and biblioitemnumber
    Add a New Item for
    "> "> ">
    BARCODE"> Home Branch:
    Replacement Price:
    Notes

    --- NEW FILE ---

    Barcode '' has already been assigned.

    Error :

    Item added with barcode

    Main Menu

    --- NEW FILE ---

    >Main Menu

    Select a set of MARC records

    \n

    Upload a set of MARC records
    Upload a set of MARC records:
    ?menu=" enctype="multipart/form-data">
    Name this set of MARC records:
    --- NEW FILE ---

    Main Menu

    Select a New File

    Select a Record to Import from
    > " [Viewing to of records] |
    Search still pending... processing... No results found for query ?file=&resultsid=&=&searchfield=&searchvalue=> --> ?file=&numrecord=>
    --- NEW FILE ---

    Main Menu

    --- NEW FILE --- > ()

    New Record

    Full MARC Record available at bottom
    Title" size=40 maxlenght=255>
    Subtitle" size=40 maxlenght=255>
    Author" size=40 maxlenght=255>
    Additional authors
    Illustrator" size=40 maxlenght=255>
    Copyright" size="20" maxlenght=80>
    Series Title" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Number" size=40 maxlenght=255>
    Volume Date" size=40 maxlenght=255>
    Volume Description" size=40 maxlenght=255>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item Type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    LCCN" size=40 maxlenght=40>
    Dewey" size=8 maxlenght=10>
    Subclass" size=40 maxlenght=40>
    Publication Year" size=5 maxlenght=10>
    Publisher" size=40 maxlenght=255>
    Place" size=40 maxlenght=255>
    Pages" size=5 maxlenght=10>
    Size" size=40 maxlenght=40>
    "> "> "> "> --> "> "> ">
    MARC RECORD
          "> 
    --- NEW FILE ---

    >Main Menu

    Select a set of MARC records

    Upload a set of MARC records
    Upload a set of MARC records:
    ?menu=" enctype="multipart/form-data">
    > Name this set of MARC records:
    From oleonard at users.sourceforge.net Thu Feb 19 20:12:45 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:12:45 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members imemberentry.tmpl,NONE,1.1 jmemberentry.tmpl,NONE,1.1 member-password.tmpl,NONE,1.1 member.tmpl,NONE,1.1 memberentry.tmpl,NONE,1.1 members-home.tmpl,NONE,1.1 moremember.tmpl,NONE,1.1 pay.tmpl,NONE,1.1 readingrec.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30848/koha-tmpl/intranet-tmpl/npl/en/members Added Files: imemberentry.tmpl jmemberentry.tmpl member-password.tmpl member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl pay.tmpl readingrec.tmpl Log Message: New NPL templates --- NEW FILE ---

    Edit Institution

    Add New Institution

    " />
    " />
    " />
    " />
    " />
    Contact Details
    " />
    " />
    " />
    " />
    Institution Details
    " />

    --- NEW FILE ---
    " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " />

    Add New Juvenile Patron

    Parent or Guardian
    " />
    " />
    " size="20" > -->
    Child
    " name="cardnumber_child_" size="20" value="" />" value="" />
    " name="firstname_child_" size="20" />
    " name="surname_child_" size="20" />
    " id="dateofbirth_child_" size="10" />
    " name="sex_child_" value="F" />F " value="M" />M

    --- NEW FILE ---

    Password Updated

    ">Return to Member Details

    ">

    Change Username and/or Password for

    You have entered a User ID that already exists. Please choose another one.
    New UserID:" />
    New Password:" />

    '; return false;" />

    --- NEW FILE ---
    -->
    Patron Search Results
    Card Name Cat Address OD/Issues Notes
    (" title="Issue to this Patron">ISS) ">,
    No results found
    --- NEW FILE ---

    :

    ,

    " /> checked="checked" />F checked="checked" /> M
    " /> " /> ()
    " />
    " />
    " size="20" />
    " />
    " />
    " />
    " />
    Alternate Contact
    " />
    " />
    Flags
    " name="" value="1" />Yes " name="" value="0" />No
    Patron Details
    " maxlength="7" /> " /> " /> " /> " />

    " />UpdateAdd This Member" /> '; return false;" />

    --- NEW FILE ---

    Patrons

    --- NEW FILE ---

    ()

    " />" />" />
    " />
    " />
    " />
    " />
    Name: ,
    Address:
    ,
    Permanent Address:
    ,
    Home Phone:  
    Work Phone:
    Fax:
    E-mail:">
    Text messaging:
    Date of Birth: 
    Sex: 
    Member Number:
    Category:
    Registration Date:,  
    Expiration Date 
    Registration Branch:
    Ethnicity:,
    General Notes:

    Alternate Contact:
    • Name:
    • Phone:
    • Relationship:
    • Notes:
    Guarantees: 
    Guarantor: ">
    No guarantor
    Fines & Charges
    &bib=&bi=">  
    ">View Account ">Pay Fines
    " />
    -->
    Items On Loan
    Title Due Itemtype Renew Return
    &bib=&bi="> ">Reserved " value="y" /> ">Return

    " />" value="y" />
    " /> " />
    Reserves
    Title Requested Remove
    ">

    Reading Record
    ">View Patron's Reading Record
    --- NEW FILE ---
    " />
    Pay Fines for
    Fines & Charges Description Account Type Amount Amount Outstanding
    " type="radio" name="payfine" value="no" checked="checked" />
    " name="payfine" value="yes" />
    " name="payfine" value="wo" />
    " value="" /> " value="" /> " value="" /> " value="" /> " value="" /> " value="" />
    Total Due
    " name="bornum" />
    --- NEW FILE --- From oleonard at users.sourceforge.net Thu Feb 19 20:15:19 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:15:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports reports-home.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31482/koha-tmpl/intranet-tmpl/npl/en/reports Added Files: reports-home.tmpl Log Message: New NPL templates --- NEW FILE ---

    Reports

    From oleonard at users.sourceforge.net Thu Feb 19 20:16:52 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:16:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc result.tmpl,NONE,1.1 search.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/koha-tmpl/intranet-tmpl/npl/en/search.marc Added Files: result.tmpl search.tmpl Log Message: New NPL templates --- NEW FILE --- --- NEW FILE ---

    Advanced MARC Search

    " />
    Help:

    Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search. Search commits the request and displays the results.
      value="" />
    Results per page :
    From oleonard at users.sourceforge.net Thu Feb 19 20:19:58 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:19:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/value_builder unimarc_field_100.tmpl,NONE,1.1 unimarc_field_105.tmpl,NONE,1.1 unimarc_field_225a.tmpl,NONE,1.1 unimarc_field_60X.tmpl,NONE,1.1 unimarc_field_700-4.tmpl,NONE,1.1 unimarc_field_700_701_702.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32499/koha-tmpl/intranet-tmpl/npl/en/value_builder Added Files: unimarc_field_100.tmpl unimarc_field_105.tmpl unimarc_field_225a.tmpl unimarc_field_60X.tmpl unimarc_field_700-4.tmpl unimarc_field_700_701_702.tmpl Log Message: New NPL templates --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Année début ">
    Année fin ">
    --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Ann?e d?but ">
    Ann?e fin ">
    --- NEW FILE --- UNIMARC Field 225a builder
    Select a collection
    --- NEW FILE --- Thesaurus search

    Recherche

    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
    "> "> ">

    Results

    &level=&search_string="> ')">

    Dependancies

    &level=&search_string=+"> ')">

    Adding

    "> "> Create a new authority/thesaurus entry : ">
    --- NEW FILE --- UNIMARC constructeur champ 700-4

    Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.

    Code date publication
    --- NEW FILE --- Personal Authorities builder

    "> "> "> "> "> ">

    "> ">
    "> insert a new authority : ">
    From oleonard at users.sourceforge.net Thu Feb 19 20:21:25 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:21:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/z3950 searchresult.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv346/koha-tmpl/intranet-tmpl/npl/en/z3950 Added Files: searchresult.tmpl Log Message: New NPL templates --- NEW FILE --- ">

    Z3950 Search Results

    ">
    Bibliographic Records Found
    Title Author ISBN coming from    
    )">Import this biblio
    Nothing found

    Still requests to go

    From oleonard at users.sourceforge.net Thu Feb 19 20:01:06 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:01:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio-nomarc.tmpl,NONE,1.1 addbiblio.tmpl,NONE,1.1 addbooks.tmpl,NONE,1.1 additem-nomarc.tmpl,NONE,1.1 additem.tmpl,NONE,1.1 isbnsearch.tmpl,NONE,1.1 marcimport.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28575/koha-tmpl/intranet-tmpl/npl/en/acqui.simple Added Files: addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl additem.tmpl isbnsearch.tmpl marcimport.tmpl Log Message: New NPL templates --- NEW FILE --- Adding a new Biblio
    Section One: Copyright Information

     

    Please Specify a Title
    Title: *
    Subtitle:
    Author:
    Series Title:
    (if applicable)
    Copyright Date:
    Abstract:
    Notes:
    * Required --- NEW FILE ---
    " />

    Edit MARC Record Number Add MARC Record

    Save Bibliographic Record and Go To ItemsAdd Bibliographic Record and Go To Items" onclick="Check(this.form);" class="submit" accesskey="w" />
    007-130 240-490 500-586 600-655 700-856 942
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
      * " /> " /> " /> " /> " />
    " /> " /> " /> " /> " /> " /> " /> " /> " />
    --- NEW FILE ---

    Catalog Maintenance

     

    No items found

     

    Website Biblioitem Added " />
    Create Brief Record

    -->

    Search Existing Records

    • If the ISBN is found into the biblio table, it will be retrieved and can be modified.
    • If the ISBN is found into the breeding farm, it will be retrieved, and a biblio added.
    • Otherwise, a biblio can be added from scratch.


    Add New Website
    --- NEW FILE --- test

    You must give the item a barcode

    You must create a new group for your item to be added to

    Sorry, that barcode is already in use

    BIBLIO RECORD
    Author:
    Copyright:
    Series Title:
    Notes:
    GROUP -
    URL:
    Date:
    Notes:
    GROUP -
    ISBN:
    Dewey:
    Publisher:
    Place:
    Date:
    Item:
    Home Branch:
    Notes:

    ">
    ADD NEW ITEM:
    For a website add the group only
    Item Barcode:
    Branch:
    Replacement Price:
    Notes:
    Add to existing group:
    Group:
    OR Add to a new Group:
    Format:
    ISBN:
    Publisher:
    Publication Year:
    Place of Publication:
    Illustrator:
    Additional Authors:
    One Author per line
    Subject Headings:
    One Subject per line
    Website URL:
    Dewey:
    Dewey Subclass:
    ISSN:
    LCCN:
    Volume:
    Number:
    Volume Description:
    Pages:
    Size:
    Notes:
    --- NEW FILE ---

    Items for Bibliographic Record

    ">
    ">
    Existing Items
     
    &itemnum=">Edit
    ERROR: Barcode already exists!

    Add New ItemUpdate Item

    "> ">
    * "> "> ">
    "> "> "> ">
    --- NEW FILE ---

    Biblio Search Results for ISBN title

    results found
    Results to displayed
    Existing Bibliographic Records
    Title Author © Call Number  
    ">   ">Edit Biblio">Edit Items
    Nothing found
    Bibliographic Records in the Breeding Farm
    Title Author ISBN coming from    
    ">Add biblio
    Nothing found
    " name="isbn" />
    --- NEW FILE ---
    " enctype="multipart/form-data">

    MARC acquisition system

    Import into breeding farm

    Import results :

      imported records

      not imported because already in DB

      not imported because already in farm

      not imported because they seems not to be MARC format (or ISBN/ISSN missing) !

      records parsed

      Back to acquisition

    • Select a file to import into breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in breeding farm. If an ISBN already exists in the breeding farm, you can choose wether to ignore the new one, or overwrite the old one.
    • You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested marc data comes !
    • Of course, if the ISBN already exists in active DB, the biblio will be ignored.
    Select the file to import :
    Name of this import :
    If ISBN already in breeding farm : Ignore this one, keep the existing one
    Overwrite the existing one with this
    From oleonard at users.sourceforge.net Thu Feb 19 20:14:38 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:14:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,NONE,1.1 aqbookfund.tmpl,NONE,1.1 aqbudget.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 categorie.tmpl,NONE,1.1 categoryitem.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,NONE,1.1 itemtypes.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 printers.tmpl,NONE,1.1 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 thesaurus.tmpl,NONE,1.1 z3950servers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31268/koha-tmpl/intranet-tmpl/npl/en/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: New NPL templates --- NEW FILE ---

    Koha Admin Page

    Parameters

    Biblio related
    Item types the supports of an item.
    Budget The monies allocated to your book funds.
    Book Funds Book fund administration. Remember to edit your book funds before you start editing the budgets.
    Authorised Values Define here categories and authorised values for them. Authorised values are used in MARC form to limit/help editing MARC biblios
    Thesaurus Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
    MARC related
    MARC tag structureMARC structure : tag then subfields
    Links koha - MARC DBDefine links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage
    Checks MARCChecks the MARC structure. USE IT before working with real datas. It will show mistakes that BREAKS koha database!
    Various parameters
    Library Branches the differents branches you manage with this Koha server
    Borrower Categories the differents types of borrowers.
    Currencies Currencies of booksellers.
    Printers Printers (UNIX paths).
    Stop Words Words deleted during searches
    Z39.50 Servers Servers to query for MARC data
    System Preferences System preferences

    Tools

    Import/Export
    MARC biblio export Exporting in MARC format
    Upload MARC records in Breeding Farm The breeding farm is a table where imported MARC records are stored.
    A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm.
    --- NEW FILE ---

    Bookfund Administration

    You Searched for
    Book fund Name Edit Delete
    ?op=add_form&bookfundid= "> ?op=add_form&bookfundid= ">Edit ?op=delete_confirm&bookfundid=">Delete
      Budget ">Add Budget
      - : ">Edit ">Delete

    " name="Aform" method="post">
    Book fund" />
    Book fund
    Name" />

    '; return false;" />

    Data Recorded

    " method="post">

    Confirm Deletion of Fund

    Book fund
    Name
    Group
    " method="post">" />
    " method="post">

    Data Deleted

    " method="post">
    --- NEW FILE ---

    Budget admin

    You Searched for
    Book fundStart dateEnd dateBudget amount 
    () ">Edit ">Delete

    Book fund" />
    Book fund name
    Bookfund" />
    Start date ()" /> 
    End date ()" />
    Budget amount" />
    " />

    Budget Data Recorded

    " method="post">

    Delete Book Fund ''?

    Start date
    End date
    budgetamount
    " method="post">" />
    " method="post">

    Book fund deleted

    " method="post">
    --- NEW FILE ---
    " name="Aform" method="post">

    Category
    Authorised value " />
    Lib " />

    " />

    Confirm Deletion

    Variable Lib
    Value
    " method="post"> " /> " />
    " method="post">

    Authorised values admin

    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.

    When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio, the subfield is not entered through a free field, but though a list of authorised values

    Category Authorised value Lib Edit Delete
    "> ">Edit ">Delete
    " method="post"> " />
    --- NEW FILE ---

    " name="Aform" method="post">
    Branch code " /> " />
    Name " /> 
    " />
    Address " />
      " />
      " />
    Phone " />
    Fax " />
    E-mail " />

    Confirm of Branch :

    " method="post"> " />
    " method="post">
    Name Code Address Category    
    (nothing entered)


    Ph:
    Fax:
    Email:     		(no categories set)
    " />
    " />

    Branches Categories
    Name Code Description    
    " />
    " />
    " method="post">

    Category code " /> " />
    Name " /> 
    Description " /> 
    Confirm delete:
    " />
    " method="post">
    --- NEW FILE ---
    " name="Aform" method="post">

    Modify category

    Add category

    Category code " />
    Category code
    Description
    Enrolment period years
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrollment fee
    Overdue notice required" />
    Issue limit" />
    Reserve fee" />

    Update CategoryAdd Category" onclick="Check(this.form);" /> '; return false;" />

    Data recorded

    " method="post">

    Confirm Deletion of Category

    Patrons with Category '':

    Category code
    Description
    Enrolment period
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee

    This category is used times. Deletion not possible

    " method="post"> " />
    " method="post">
    " method="post"> " />
    " method="post">

    Category Deleted

    " method="post">

    Patron Category Administration

    You Searched for
    " method="post"> " />
    --> --> -->
    Category Description Enrollment Upper Age Limit Age Required Bulk Overdue Issue Limit  
    ?op=add_form&categorycode=">Edit ">Delete
    " method="post">
    --- NEW FILE ---

    Modify category

    Add category

    " name="Aform" method="post">
    Category code ">
    Category code
    Description ">  
    Enrolment period ">
    Upperage limit ">
    Age Required ">
    Fine type ">
    Bulk ">
    Enrolment fee ">
    Overdue notice required ">
    Issue limit ">
    Reserve fee ">
     
    Data recorded " method="post">
    TOTAL : :
    "> data deleted

    Category admin

    You Searched for " method="post">
    Category code
    Description
    Enrolment period
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee
    This record is used times. Deletion not possible
    " method="post">
    CONFIRM DELETION
    ">
    Category Description Enrolment Upper Age Limit Age Required Fine Bulk Fee Overdue Issue Limit Reserve    
    ?op=add_form&categorycode=">Edit ?op=delete_confirm&categorycode=">Delete

    " method="post">

    --- NEW FILE ---

    Calculating Fines

    Each box needs to be filled in with fine,time to start charging,charging cycle

    eg 1,7,7 = $1 fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

     
    "> " value="" size="6" maxlength="10">
    --- NEW FILE ---

    MARC Checks

    Test Result
    itemnum
    • The field itemnum MUST be mapped
    • The correspounding subfield MUST be in with -1 (ignore) tab
    OK itemnum : the field itemnumber is mapped to a field in tab -1
    item fields ALL items fields MUST :
    • be mapped to the same tag,
    • and they must all be in the 10 (items) tab
    OK All item fields are in the same tag and in item tab
    itemtype NOT mapped the biblioitems.itemtype field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised_value=itemtype
    OK biblioitems.itemtype defined
    homebranch NOT mapped the items.homebranch field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised value=branches
    OK homebranch defined
    holdingbranch NOT mapped the items.holdingbranch field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised value=branches
    OK holdingbranch defined
    biblio and biblionumber The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
    • be mapped to a MARC subfield,
    • be in the SAME tag (for example : 090$a and 090$b)
    • be in tab -1
    OK biblionumber and biblioitemnumber mapped correctly
    TOTAL You have error(s) in your MARC configuration. Please fix them before using Koha

    Configuration OK, you don't have errors in your MARC parameters table

    --- NEW FILE ---
    Modify currency Add currency
    Currency " />
    Currency
    Rate " />
    '; return false;" />

    Data Recorded

    " method="post">
    Confirm Deletion of Currency
    Currency
    Rate
    This currency is used times. Deletion not possible
    " method="post">
    " />
    " method="post">

    Currency Deleted

    " method="post">

    Currencies admin

    You searched for
    Currency Rate  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    ?offset="><< Prev ?offset=">Next >>
    --- NEW FILE ---
    " name="Aform" method="post">
    Modify item type Add item type
    Item type" />
    Item type
    Description " /> 
    Not for loan checked="checked" value="1"> (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)
    Loan length "> (meaningful only if not for loan is not set)
    Renewals allowed? checked="checked" value="1" />
    Rental charge " />
    -->
    Cannot Delete Item TypeDelete Item Type ''?
    Item type
    Description
    Loan length
    RenewalsAllowedNot allowed
    " method="post"> " />
    This record is used times. Deletion is not possible.
    " method="post">
    " method="post">
    -->
    Item Types Administration
    Code Description Loan Length Renewable Edit Delete
    ?op=add_form&itemtype="> YesNo ?op=add_form&itemtype=">Edit ?op=delete_confirm&itemtype=">Delete
    " method="post">

    '; return false;" value="<< Previous Page" /> '; return false;" value="Next Page >>" />

    --- NEW FILE ---

    Choose and validate 1 of the following for .

    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " name="Aform" method="post"> " /> " />

    MARC links

    " method="post">

    Koha Field Tag Subfield Lib
    "> ">Edit
    --- NEW FILE ---
    " name="Aform" method="post">

    Field Lib for librarians / for opac Repeat Mand Koha field Tab Authorised value or
    Thesaurus category
    - " size="40" maxlength="80" />
    " size="40" maxlength="80" />
    or
    or
    '; return false;" />

    Note : in the last column, you can choose :

    • An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table
    • A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table
    • A "value builder" : values builders are perl program that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly
    Confirm Deletion of Subfield
    Subfield
     
    " method="post">" /> " /> " />
    " method="post">" />
    data deleted
    method="post">" />

    MARC subfield structure admin for

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit".

    The column koha field shows that the subfield is linked with a "koha field". Koha can manage a marc interface, or a koha interface. This link ensure that both DB are synchronized, thus you can change from MARC to KOHA interface easily.

    Subfield Lib Koha Field ? Rep ? Mand ? Tab ? Auth value ? Thesaurus ? Val build ? Delete
          YesNo  YesNo          ">Delete
    //images/1leftarrow.png" title="previous" alt="previous" border="0" />
    " />
    " name="searchfield" />
    //images/1rightarrow.png" title="next" alt="next" border="0" />
    --- NEW FILE ---

    " name="Aform" method="post">
    Tag
    Lib for librarians" size="80" maxlength="100" />
    Lib for opac" size="80" maxlength="100" />
    Repeatable
    Mandatory
    Authorised value (if you select a value here, the indicators will be limited to the authorised value list)

    '; return false;" />

    Confirm Deletion of Tag

    Tag
     
    " method="post">" />
    " method="post">

    Data Deleted

    " method="post">

    MARC tag structure admin

    " method="post">
    Tag Lib Repeatable Mandatory Authorised value Subfields Edit/Delete
    "> YesNo YesNo ">subfields ">Edit ">Delete
    <<Previous Tags
    " method="post">
    Next Tags >>
    --- NEW FILE ---

    Modify printer

    Add printer

    " name="Aform" method="post">
    Printer Name
    Printer Name
    Queue " />
    Type " />

    ';" />

    Printer Added

    " method="post">

    Confirm Deletion of Printer

    Printer
    Queue
    Type
    " method="post"> " />
    " method="post">

    Printer Deleted

    " method="post">

    Printer Admin

    You searched for
    " method="post"> " />
    Name Queue Type  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    " method="post">

    ?offset="><< Prev ?offset=">Next >>
    --- NEW FILE ---

    Modify Stop Word

    Add Stop Word

    Stop Word
    Stop Word:

    Update Stop WordAdd Stop Word " onclick="Check(this.form);" class="submit" /> ';" />

    Stop Word Added

    " method="post">

    Confirm Deletion of Stop Word

    Stop Word:
    " method="post"> " />
    " method="post">

    Stop Word Deleted

    " method="post">

    Stop Words Admin

    " method="post"> " />
    You searched for
    Word  
    ?op=delete_confirm&searchfield=">Delete
    " method="get">" />
    " method="post">
    " method="get">" />
    --- NEW FILE ---
    " name="Aform" method="post">

    Modify a system preference

    Add a system preference

    " />
    " />
    " />

    Update ParameterAdd Parameter" onclick="Check(this.form); return false;" class="submit" /> '; return false;" />

    Data Recorded

    " method="post">

    Confirm Deletion of Parameter

    " method="post">" />
    " method="post">

    Parameter Deleted

    " method="post">

    System Preferences Administration

    Variable Value Explanation  
    "> ">Edit ">Delete
    " method="post">

    --- NEW FILE ---

    Thesaurus management

     
    Values related to ()


    " method="post">
    Other forms    
    ">Edit ">Delete
    " method="post"> " /> " />

    " name="Aform" method="post">

    AddModify

    Category
    Authority lib " /> " maxlength="80" size="80" />
    Other lib " maxlength="80" size="80" />

    " /> " /> " /> " /> " /> " /> AddModify Value" />

    lib
    Value
    " method="post"> " /> " />
    CONFIRM DELETION of this entry and all entries depending from this one
    " method="post">

    Thesaurus management

    Manages thesaurus and authorities files.

    • Dig: see data dependent one this one
    • Related: see other forms of this authority entry
    " />
    &search_category=">
      Free form Authority Dig Related Edit Delete
      Dig Related ">//images/fileopen.png" width="32" hspace="0" vspace="0" border="0" /> ">//images/edittrash.png" width="32" hspace="0" vspace="0" border="0" />

    " method="post">

    " method="post"> " /> " /> " />

    --- NEW FILE ---
    " name="Aform" method="post">

    Modify Z39.50 Server

    Add Z39.50 Server

    Z39.50 Server " />
    Z39.50 Server
    Hostname " />
    Port " onblur="isNum(this)" />
    Database " />
    Userid " />
    Password " />
    Checked (searched by default) " onblur="isNum(this)" />
    Rank (display order) " onblur="isNum(this)" />
    Syntax (z3950 can send
    records in various format. Choose one)
    ';" />

    Z39.50 Server Added

    " method="post">

    Confirm Deletion of Server

    Site
    Hostname
    Port
    Database
    Userid
    Password
    Checked
    Rank
    " method="post"> " />
    " method="post">

    Z39.50 Server Deleted

    " method="post">

    Z39.50 Servers Admin

    " method="post"> " />
    You searched for
    Site Hostname Port Database Userid Password Checked Rank Syntax  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    " method="get"> " />
    " method="post">
    " method="get"> " />
    From oleonard at users.sourceforge.net Thu Feb 19 20:22:21 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:22:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en about.tmpl,NONE,1.1 auth.tmpl,NONE,1.1 bookcount.tmpl,NONE,1.1 boraccount.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 default.tmpl,NONE,1.1 intranet-main.tmpl,NONE,1.1 mancredit.tmpl,NONE,1.1 maninvoice.tmpl,NONE,1.1 member-flags.tmpl,NONE,1.1 modbib.tmpl,NONE,1.1 modbibitem.tmpl,NONE,1.1 moditem.tmpl,NONE,1.1 modwebsites.tmpl,NONE,1.1 newimember.tmpl,NONE,1.1 newjmember.tmpl,NONE,1.1 newmember.tmpl,NONE,1.1 opac-main.tmpl,NONE,1.1 overdue.tmpl,NONE,1.1 reports.tmpl,NONE,1.1 request.tmpl,NONE,1.1 reservereport.tmpl,NONE,1.1 searchheader.tmpl,NONE,1.1 shelves.tmpl,NONE,1.1 stats.tmpl,NONE,1.1 thesaurus_popup.tmpl,NONE,1.1 updatebiblio.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv614/koha-tmpl/intranet-tmpl/npl/en Added Files: about.tmpl auth.tmpl bookcount.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl member-flags.tmpl modbib.tmpl modbibitem.tmpl moditem.tmpl modwebsites.tmpl newimember.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl reports.tmpl request.tmpl reservereport.tmpl searchheader.tmpl shelves.tmpl stats.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: New NPL templates --- NEW FILE ---

    About Koha

    Data about the current version of Koha for bug reports (or general interest).

    Koha version:
    OS version (from 'uname -a'):
    Perl version:
    MySQL version:
    Apache version:
    --- NEW FILE ---

    Sorry, Koha doesn"t think you have permission for this page.

    Sorry, your session has timed out. Please login again.

    You are accessing Koha from a different ip address! Please login again.

    You entered an incorrect username or password. Please try again.

    " method="post"> " value="" />
    Koha Login
    --- NEW FILE ---

    ()

    Barcode

    ">
    ">">">">
    " name="bib">
    Home Branch:
    Current Branch:
    Date arrived at current branch:
    Number of issues since since the above date :
    Branch No. of Issues Last seen at branch
    --- NEW FILE ---
    Account for
    Fines & Charges Amount Still Owed
    Total Due
    " />
    " />
    " />
    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = $1 fine, after 7 days, every 7 days.

    " value="" size="6">
    --- NEW FILE ---

    TitleAuthorItem CountBiblionumber
    ">
    &startfrom=>Previous Records &startfrom=>Next Records

    Results through of records.
    --- NEW FILE ---
    --- NEW FILE ---

    Manual Credit

    " />
    Patron Number
    Credit Type
    Itemnumber
    Description
    Amount
    " name="bornum" />
    --- NEW FILE ---

    Manual Invoice

    " />
    Borrowernumber
    Type
    Itemnumber
    Description
    Amount
    " />
    --- NEW FILE ---
    "> " />
    Set Privileges for ,
    FlagNameDescription
    " />

    '; return false;" />

    --- NEW FILE ---
    ">Modify Website Links
    " /> " />
    Author " />
    Title " />
    Abstract
    Subject
    Copyright Date " />
    Series Title " />
    Additional Author " />
    Subtitle " />
    Unititle " />
    Notes
    Serial " />

    --- NEW FILE ---

    &type=intra"> ()
    Modify Group -

    " /> " />
    RE-ASSIGN TO EXISTING GROUP
    OR MODIFY DETAILS
    Item Type" size="20" />
    URL " size="20" />
    Class" size="20" />
    Publisher" size="20" />
    Place" size="20" />
    ISBN" size="20" />
    Publication Year" size="20" />
    Pages" size="20" />
    Illustrations" size="20" />
    Volume " size="20" />
    Notes " />
    Size " size="20" />
    CHANGES TO AFFECT THESE BARCODES
    Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.
      Barcode Location Date Due Last Seen
    " /> "amp;bib="TMPL_VAR Name="biblionumber">"amp;bi="TMPL_VAR Name="biblioitemnumber">">

    HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some items, tick the appropriate ones and a new group record will be created automatically for them.

    --- NEW FILE ---

    ()

    " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " />
    checked="checked"> Yes checked="checked"> No -->
    checked="checked" /> Yes checked="checked" /> No

    --- NEW FILE ---

    Web Sites

    " />
    " /> " />
    Title " />
    Description
    URL " />

    Add another Website Link

    " />
    Title
    Description
    URL
    --- NEW FILE ---
    Invalid cardnumber.

    Valid values

    Click below to confirm this new borrower.

    " value="" />
    --- NEW FILE ---

    Error Completing Form

    -->
    Confirm Details for
    Name
    Membership Number
    Barcode Number
    Date Of Birth
    Sex
    General Notes

    " value="" />

    --- NEW FILE ---

    Confirm Record

    Name: 
    Address: 
    Home Phone:  
    Work Phone:
    Fax:
    E-mail:
    Date Of Birth: 
    Sex: 
    Member Number: 
    Card Number: 
    Category: 
    Registration Date: 
    Expiration Date: 
    Registration Branch: 
    General Notes: 
    Alternate contact: 
    Contact's Phone: 
    Relationship to Patron: 
    Notes:

    " value="" />

    Error

    The following fields have a forbidden value. Please push the back button and try again :

    Cardnumber
    Invalid_cardnumber
    Gender
    Given Names
    Surname
    Postal Street Address
    Postal city
    --- NEW FILE --- WELCOME TO THE KOHA OPAC

    Koha: Horowhenua Library Trust Catalogue and Member Services    		 Search the Catalogue
       

    Type in the box and press the enter key.
    -Advanced Search (More Options)

    Logged in as: [Log Out]

    Log In to Koha

    --- NEW FILE ---

    Items Overdue as of

    Due Date Patron Phone Title Author
    ?subject=Overdue: ">
    --- NEW FILE ---

    reports

    --- NEW FILE ---
    " /> " />

    Add Reserve for ">

    Rank
    Date
    Pickup
    Card Number ?
    Cannot be selected > > -->   -->   -->
    Item Type Call Number Copies
     
    " action="modrequest.pl" method="post">

    Modify Existing Requests

    &type=intra" onClick="openWindow(this, 'Item', 480, 640)"> Next Available This type only : -->
    Rank Patron Notes Date Pickup Location
    " /> " /> ">   Item waiting at " />

    Delete a request by selecting "del" from the rank list.

    --- NEW FILE ---
    NameReserve DateTitleClass

    --- NEW FILE --- ">Results with dewey | ">Results with biblionumber
    --- NEW FILE ---

    Logged in as: [Log Out]

    Shelf List

    Add a book by barcode:

    "> Contents of shelf
    ">"> " width=10 align=center> "> " width=10 align=center> "> " width=10 align=center> ">

    "> ">

    Modify Shelf Contents

    Bookshelves

    "> Select Shelves to Delete
    "> "> ( books)

    Add Shelf:

    ">
    "> Shelf List
    "> "> ( books)

    Add or Remove Book Shelves

    --- NEW FILE ---
    Statistics
    Name Type Date/time Amount Branch

    Total paid:
    Total written off:

    No statistics to report

    --- NEW FILE --- Thesaurus value builder for category <!-- TMPL_VAR name="category" -->

    "> "> ">

    "> "> ">
    "> "> insert a new authority :
    --- NEW FILE ---

    Click submit to force the subject

    " value="" /> " />
    From oleonard at users.sourceforge.net Thu Feb 19 22:12:05 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 13:12:05 -0800 Subject: [Koha-cvs] CVS: npl-custom - Imported sources Message-ID: Update of /cvsroot/koha/npl-custom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26378 Log Message: Status: Vendor Tag: tcvs-vendor Release Tags: tcvs-release No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources From acli at users.sourceforge.net Thu Feb 19 22:24:33 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 13:24:33 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,NONE,1.1 xgettext.pl,NONE,1.1 TmplToken.pm,1.2,1.3 TmplTokenType.pm,1.2,1.3 TmplTokenizer.pm,1.10,1.11 text-extract2.pl,1.40,1.41 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27741 Modified Files: TmplToken.pm TmplTokenType.pm TmplTokenizer.pm text-extract2.pl Added Files: tmpl_process3.pl xgettext.pl Log Message: New scripts for translation into Chinese and other languages where English word order is too different than the word order of the target language to yield meaningful translations. The new scripts use a different translation file format (namely standard gettext-style PO files). This seems to reasonably work (e.g., producing an empty en_GB translation then installing seems to not corrupt the "translated" files), but it likely will still contain some bugs. There is also little documentation, but try to run perldoc on the .p[lm] files to see what's there. There are also some spurious warnings (both from bugs in the new scripts and from buggy third- party Locale::PO module). --- NEW FILE --- #!/usr/bin/perl # This file is part of Koha # Parts copyright 2003-2004 Paul Poulain # Parts copyright 2003-2004 Jerome Vizcaino # Parts copyright 2004 Ambrose Li =head1 NAME tmpl_process3.pl - Experimental version of tmpl_process.pl using gettext-compatible translation files =cut use strict; use Getopt::Long; use Locale::PO; use File::Temp qw( :POSIX ); use TmplTokenizer; use VerboseWarnings qw( error_normal warn_normal ); ############################################################################### use vars qw( @in_files $in_dir $str_file $out_dir ); use vars qw( @excludes $exclude_regex ); use vars qw( $recursive_p ); use vars qw( $pedantic_p ); use vars qw( $href ); use vars qw( $type ); # file extension (DOS form without the dot) to match ############################################################################### sub find_translation ($) { my($s) = @_; my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; return defined $href->{$key} && length Locale::PO->dequote($href->{$key}->msgstr)? Locale::PO->dequote($href->{$key}->msgstr): $s; } sub text_replace_tag ($$) { my($t, $attr) = @_; my $it; # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; my $translated_p = 0; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME my($pre, $trimmed, $post) = TmplTokenizer::trim $val; if ($val =~ /\S/s) { my $s = $pre . find_translation($trimmed) . $post; if ($attr->{$a}->[1] ne $s) { #FIXME $attr->{$a}->[1] = $s; # FIXME $attr->{$a}->[2] = ($s =~ /"/s)? "'$s'": "\"$s\""; #FIXME $translated_p = 1; } } } } if ($translated_p) { $it = "<$tag" . join('', map { sprintf(' %s=%s', $_, $attr->{$_}->[2]) #FIXME } sort { $attr->{$a}->[3] <=> $attr->{$b}->[3] #FIXME } keys %$attr) . '>'; } else { $it = $t; } return $it; } sub text_replace (**) { my($h, $output) = @_; for (;;) { my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { my($pre, $trimmed, $post) = TmplTokenizer::trim $t; print $output $pre, find_translation($trimmed), $post; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); print $output TmplTokenizer::parametrize($fmt, map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? text_replace_tag($t, $attr): $t } $s->parameters); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); } elsif (defined $t) { print $output $t; } } } # FIXME: Should we use the GNOME convention of using POTFILES.in instead? sub listfiles ($$) { my($dir, $type) = @_; my @it = (); if (opendir(DIR, $dir)) { my @dirent = readdir DIR; # because DIR is shared when recursing closedir DIR; for my $dirent (@dirent) { my $path = "$dir/$dirent"; if ($dirent =~ /^\./ || $dirent eq 'CVS' || $dirent eq 'RCS' || (defined $exclude_regex && $dirent =~ /^(?:$exclude_regex)$/)) { ; } elsif (-f $path) { push @it, $path if !defined $type || $dirent =~ /\.(?:$type)$/; } elsif (-d $path && $recursive_p) { push @it, listfiles($path, $type); } } } else { warn_normal "$dir: $!", undef; } return @it; } ############################################################################### sub usage_error (;$) { for my $msg (split(/\n/, $_[0])) { print STDERR "$msg\n"; } print STDERR "Try `$0 --help' for more information.\n"; exit(-1); } ############################################################################### GetOptions( 'input|i=s' => \@in_files, 'outputdir|o=s' => \$out_dir, 'recursive|r' => \$recursive_p, 'str-file|s=s' => \$str_file, 'exclude|x=s' => \@excludes, 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, ) || usage_error; VerboseWarnings::set_application_name $0; VerboseWarnings::set_pedantic_mode $pedantic_p; my $action = shift or usage_error('You must specify an ACTION.'); usage_error('You must at least specify input and string list filenames.') if !@in_files || !defined $str_file; # Type match defaults to *.tmpl plus *.inc if not specified $type = "tmpl|inc" if !defined($type); # Check the inputs for being files or directories for my $input (@in_files) { usage_error("$input: Input must be a file or directory.\n" . "(Symbolic links are not supported at the moment)") unless -d $input || -f $input;; } # Generates the global exclude regular expression $exclude_regex = '(?:'.join('|', @excludes).')' if @excludes; # Generate the list of input files if a directory is specified if (-d $in_files[0]) { die "If you specify a directory as input, you must specify only it.\n" if @in_files > 1; # input is a directory, generates list of files to process $in_dir = $in_files[0]; $in_dir =~ s/\/$//; # strips the trailing / if any @in_files = listfiles($in_dir, $type); } else { for my $input (@in_files) { die "You cannot specify input files and directories at the same time.\n" unless -f $input; } } if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; system {'./xgettext.pl'} ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { my($tmph1, $tmpfile1) = tmpnam(); my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2); system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { if(!defined($out_dir)) { usage_error("You must specify an output directory when using the install method."); } if ($in_dir eq $out_dir) { warn "You must specify a different input and output directory.\n"; exit -1; } # Make sure the output directory exists # (It will auto-create it, but for compatibility we should not) -d $out_dir || die "$out_dir: The directory does not exist\n"; # Try to open the file, because Locale::PO doesn't check :-/ open(INPUT, "<$str_file") || die "$str_file: $!\n"; close INPUT; # restores the string list from file $href = Locale::PO->load_file_ashash($str_file); # creates the new tmpl file using the new translation for my $input (@in_files) { die "Assertion failed" unless substr($input, 0, length($in_dir) + 1) eq "$in_dir/"; my $h = TmplTokenizer->new( $input ); $h->set_allow_cformat( 1 ); VerboseWarnings::set_input_file_name $input; my $target = $out_dir . substr($input, length($in_dir)); my $targetdir = $` if $target =~ /[^\/]+$/s; if (!-d $targetdir) { print STDERR "Making directory $targetdir..."; # creates with rwxrwxr-x permissions mkdir($targetdir, 0775) || warn_normal "$targetdir: $!", undef; } print STDERR "Creating $target...\n"; open( OUTPUT, ">$target" ) || die "$target: $!\n"; text_replace( $h, *OUTPUT ); close OUTPUT; } } else { usage_error('Unknown action specified.'); } exit 0; ############################################################################### =head1 SYNOPSIS ./tmpl_process3.pl [ I ] =head1 DESCRIPTION This is an experimental version of the tmpl_process.pl script, using standard gettext-style PO files. Currently, the create, update, and install actions have all been reimplemented and seem to work. The create action calls xgettext.pl to do the actual work; the update action calls xgettext.pl and msgmerge(1) to do the actual work. The script can detect directives embedded inside what appears to be a full sentence (this actual work being done by TmplTokenizer(3)); these larger patterns appear in the translation file as c-format strings with %s. =head1 BUGS The --help option has not been implemented yet. There are probably some real bugs too, since this has not been tested very much. xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. The script currently does not check carefully whether these dependent commands are present. Locale::PO(3) has a lot of bugs. It can neither parse nor generate GNU PO files properly; a couple of workarounds have been written in TmplTokenizer and more is likely to be needed (e.g., to get rid of the "Strange line" warning for #~). =head1 SEE ALSO xgettext.pl, msgmerge(1), Locale::PO(3), translator_doc.txt =cut --- NEW FILE --- #!/usr/bin/perl =head1 NAME xgettext.pl - xgettext(1)-like interface for .tmpl strings extraction =cut use strict; use Getopt::Long; use Locale::PO; use TmplTokenizer; use VerboseWarnings; use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); use vars qw( %text ); ############################################################################### sub remember ($$) { my($token, $string) = @_; $text{$string} = [] unless defined $text{$string}; push @{$text{$string}}, $token; } ############################################################################### sub string_list () { my @t = keys %text; # The real gettext tools seems to sort case sensitively; I don't know why @t = sort { $a cmp $b } @t if $sort eq 's'; @t = sort { my @aa = sort { $a->pathname cmp $b->pathname || $a->line_number <=> $b->line_number } @{$text{$a}}; my @bb = sort { $a->pathname cmp $b->pathname || $a->line_number <=> $b->line_number } @{$text{$b}}; $aa[0]->pathname cmp $bb[0]->pathname || $aa[0]->line_number <=> $bb[0]->line_number; } @t if $sort eq 'F'; return @t; } ############################################################################### sub text_extract (*) { my($h) = @_; for (;;) { my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { #$t = TmplTokenizer::trim $t; remember( $s, $t ) if $t =~ /\S/s; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { #$t = TmplTokenizer::trim $t; remember( $s, $s->form ) if $s->form =~ /\S/s; } elsif ($kind eq TmplTokenType::TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; remember( $s, $val ) if $val =~ /\S/s; } } } } } ############################################################################### sub generate_strings_list () { # Emit all extracted strings. # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (string_list) { printf OUTPUT "%s\n", $t unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } ############################################################################### sub generate_po_file () { # We don't emit the Plural-Forms header; it's meaningless for us print OUTPUT <, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\\n" "POT-Creation-Date: 2004-02-05 20:55-0500\\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n" "Last-Translator: FULL NAME \\n" "Language-Team: LANGUAGE \\n" "MIME-Version: 1.0\\n" "Content-Type: text/plain; charset=CHARSET\\n" "Content-Transfer-Encoding: 8bit\\n" EOF my $directory_re = quotemeta("$directory/"); for my $t (string_list) { next if TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; my $cformat_p; for my $token (@{$text{$t}}) { my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( $t ); printf OUTPUT "msgstr \"\"\n\n"; } } ############################################################################### sub usage ($) { my($exitcode) = @_; my $h = $exitcode? *STDERR: *STDOUT; print $h < \$directory, 'f|files-from=s' => \$files_from, 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, 'output|o=s' => \$output, 's|sort-output' => sub { $sort = 's' }, 'F|sort-by-file' => sub { $sort = 'F' }, 'help' => sub { usage(0) }, ) || usage_error; VerboseWarnings::set_application_name $0; VerboseWarnings::set_pedantic_mode $pedantic_p; usage_error('Missing mandatory option -f') unless defined $files_from; $directory = '.' unless defined $directory; if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; } else { open(OUTPUT, ">&STDOUT"); } open(INPUT, "<$files_from") || die "$files_from: $!\n"; while () { chomp; my $h = TmplTokenizer->new( "$directory/$_" ); $h->set_allow_cformat( 1 ); VerboseWarnings::set_input_file_name "$directory/$_"; text_extract( $h ); } close INPUT; generate_po_file; warn "This input will not work with Mozilla standards-compliant mode\n", undef if TmplTokenizer::syntaxerror_p; exit(-1) if TmplTokenizer::fatal_p; ############################################################################### =head1 DESCRIPTION This is an experimental script based on the modularized text-extract2.pl script. It has behaviour similar to xgettext(1), and generates gettext-compatible output files. A gettext-like format provides the following advantages: =over =item - (Future goal) Translation to non-English-like languages with different word order: gettext's c-format strings can theoretically be emulated if we are able to do some analysis on the .tmpl input and treat in a way similar to %s. =item - Context for the extracted strings: the gettext format provides the filenames and line numbers where each string can be found. The translator can read the source file and see the context, in case the string by itself can mean several different things. =item - Place for the translator to add comments about the translations. =item - Gettext-compatible tools, if any, might be usable if we adopt the gettext format. =back Right now it does about the same thing as text-extract2.pl but generates gettext-style output; however, because it is scanner- instead of parser-based, it is able to address the 4 weaknesses listed in translator_doc.txt. Ultimately, the goal is to make this able to do some kind of simple analysis on the input to produce gettext-style output with c-format strings, in order to facilitate translation to languages with a different word order than English. When the above is finished, the generated po file may contain some HTML tags in addition to %s strings. If you want to generate GNOME-style POTFILES.in files, such files (passed to -f) can be generated thus: (cd ../.. && find koha-tmpl/opac-tmpl/default/en -name \*.inc -o -name \*.tmpl) > opac/POTFILES.in (cd ../.. && find koha-tmpl/intranet-tmpl/default/en -name \*.inc -o -name \*.tmpl) > intranet/POTFILES.in This is, however, quite pointless, because the "create" and "update" actions have already been implemented in tmpl_process3.pl. =head1 SEE ALSO tmpl_process.pl, xgettext(1), Locale::PO(3), translator_doc.txt =head1 BUGS There probably are some. Bugs related to scanning of tags seem to be especially likely to be present. Its diagnostics are probably too verbose. When a within a JavaScript-related attribute is detected, the script currently displays no warnings at all. It might be good to display some kind of warning. Its sort order (-s option) seems to be different than the real xgettext(1)'s sort option. This will result in translation strings inside the generated PO file spuriously moving about when tmpl_process3.pl calls msgmerge(1) to update the PO file. =cut Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplToken.pm 17 Feb 2004 05:42:27 -0000 1.2 --- TmplToken.pm 19 Feb 2004 21:24:30 -0000 1.3 *************** *** 68,71 **** --- 68,104 ---- } + # only meaningful for TEXT_PARAMETRIZED tokens + sub children { + my $this = shift; + return $this->{'_kids'}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub set_children { + my $this = shift; + $this->{'_kids'} = ref $_[0] eq 'ARRAY'? $_[0]: \@_; + return $this; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + # FIXME: DIRECTIVE is not necessarily TMPL_VAR !! + sub parameters { + my $this = shift; + return map { $_->type == TmplTokenType::DIRECTIVE? $_: ()} @{$this->{'_kids'}}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub form { + my $this = shift; + return $this->{'_form'}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub set_form { + my $this = shift; + $this->{'_form'} = $_[0]; + return $this; + } + ############################################################################### Index: TmplTokenType.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenType.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplTokenType.pm 17 Feb 2004 03:02:39 -0000 1.2 --- TmplTokenType.pm 19 Feb 2004 21:24:30 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- This is a Java-style "safe enum" singleton class for types of TmplToken objects. + The predefined constants are =cut *************** *** 25,28 **** --- 26,30 ---- @EXPORT_OK = qw( &TEXT + &TEXT_PARAMETRIZED &CDATA &TAG *************** *** 36,40 **** ############################################################################### ! use vars qw( $_text $_cdata $_tag $_decl $_pi $_directive $_comment $_unknown ); BEGIN { --- 38,43 ---- ############################################################################### ! use vars qw( $_text $_text_parametrized $_cdata ! $_tag $_decl $_pi $_directive $_comment $_null $_unknown ); BEGIN { *************** *** 47,58 **** return $self; }; ! $_text = &$new(0, 'TEXT'); ! $_cdata = &$new(1, 'CDATA'); ! $_tag = &$new(2, 'TAG'); ! $_decl = &$new(3, 'DECL'); ! $_pi = &$new(4, 'PI'); ! $_directive = &$new(5, 'DIRECTIVE'); ! $_comment = &$new(6, 'COMMENT'); ! $_unknown = &$new(7, 'UNKNOWN'); } --- 50,62 ---- return $self; }; ! $_text = &$new(0, 'TEXT'); ! $_text_parametrized = &$new(8, 'TEXT-PARAMETRIZED'); ! $_cdata = &$new(1, 'CDATA'); ! $_tag = &$new(2, 'TAG'); ! $_decl = &$new(3, 'DECL'); ! $_pi = &$new(4, 'PI'); ! $_directive = &$new(5, 'DIRECTIVE'); ! $_comment = &$new(6, 'COMMENT'); ! $_unknown = &$new(7, 'UNKNOWN'); } *************** *** 62,75 **** } ! sub TEXT () { $_text } ! sub CDATA () { $_cdata } ! sub TAG () { $_tag } ! sub DECL () { $_decl } ! sub PI () { $_pi } ! sub DIRECTIVE () { $_directive } ! sub COMMENT () { $_comment } ! sub UNKNOWN () { $_unknown } ############################################################################### 1; --- 66,128 ---- } ! sub TEXT () { $_text } ! sub TEXT_PARAMETRIZED () { $_text_parametrized } ! sub CDATA () { $_cdata } ! sub TAG () { $_tag } ! sub DECL () { $_decl } ! sub PI () { $_pi } ! sub DIRECTIVE () { $_directive } ! sub COMMENT () { $_comment } ! sub UNKNOWN () { $_unknown } ############################################################################### + =over + + =item TEXT + + normal text (#text in the DTD) + + =item TEXT_PARAMETRIZED + + parametrized normal text + (result of simple recognition of text interspersed with directives; + this has to be explicitly enabled in the scanner) + + =item CDATA + + normal text (CDATA in the DTD) + + =item TAG + + something that has the form of an HTML tag + + =item DECL + + something that has the form of an SGML declaration + + =item PI + + something that has the form of an SGML processing instruction + + =item DIRECTIVE + + a HTML::Template directive (whether or not embedded in an SGML comment) + + =item COMMENT + + something that has the form of an HTML comment + (and is not recognized as an HTML::Template directive) + + =item UNKNOWN + + something that is not recognized at all by the scanner + + =back + + Note that end of file is currently represented by undef, + instead of a constant predefined by this module. + + =cut + 1; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** TmplTokenizer.pm 18 Feb 2004 06:56:19 -0000 1.10 --- TmplTokenizer.pm 19 Feb 2004 21:24:30 -0000 1.11 *************** *** 23,31 **** This module is a simple-minded attempt at such a scanner. - =head1 HISTORY - - This tokenizer is mostly based - on Ambrose's hideous Perl script known as subst.pl. - =cut --- 23,26 ---- *************** *** 98,101 **** --- 93,98 ---- sub CDATA_CLOSE () {'cdata-close'} + sub ALLOW_CFORMAT_P () {'allow-cformat-p'} + sub new { my $this = shift; *************** *** 171,174 **** --- 168,176 ---- } + sub allow_cformat_p { + my $this = shift; + return $this->{+ALLOW_CFORMAT_P}; + } + # Simple setters *************** *** 232,235 **** --- 234,243 ---- } + sub set_allow_cformat { + my $this = shift; + $this->{+ALLOW_CFORMAT_P} = $_[0]; + return $this; + } + ############################################################################### *************** *** 306,310 **** $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it) = (TmplTokenType::TEXT, $&); $this->_set_readahead( $' ); --- 314,318 ---- $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])*(?:[^<\s])/s) { # non-space normal text ($kind, $it) = (TmplTokenType::TEXT, $&); $this->_set_readahead( $' ); *************** *** 324,331 **** } } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! ($kind, $it) = (TmplTokenType::TAG, "$1>"); ! $this->_set_readahead( $3 ); ! $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $this->line_number_start if $2 eq ''; } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); --- 332,346 ---- } } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! # If we detect a "closed start tag" but we know that the ! # following token looks like a TMPL_VAR, don't stop ! my($head, $tail, $post) = ($1, $2, $3); ! if ($tail eq '' && $post =~ $re_tmpl_var) { ! warn_normal "Possible SGML \"closed start tag\" notation: $head<\n", $this->line_number; ! } else { ! ($kind, $it) = (TmplTokenType::TAG, "$head>"); ! $this->_set_readahead( $post ); ! $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; ! } } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); *************** *** 348,352 **** $kind = TmplTokenType::COMMENT if $it =~ /^).)*-->/; if ($kind == TmplTokenType::COMMENT && $it =~ /^).)*-->/; if ($kind == TmplTokenType::COMMENT && $it =~ /^ ! "> ! "&bib=""&bi="""> --- 81,87 ---- ! "> ! &bib=&bi="> From acli at users.sourceforge.net Fri Feb 20 03:49:28 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple additem-nomarc.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/acqui.simple Modified Files: additem-nomarc.tmpl Log Message: Make the translation tool happier. Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** additem-nomarc.tmpl 9 Dec 2003 10:29:07 -0000 1.6 --- additem-nomarc.tmpl 20 Feb 2004 02:49:26 -0000 1.7 *************** *** 174,178 **** LCCN: ! --- 174,178 ---- LCCN: ! From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbasket2.tmpl,1.8,1.9 supplier.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/acqui Modified Files: newbasket2.tmpl supplier.tmpl Log Message: Make the translation tool happier. Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** newbasket2.tmpl 11 Feb 2004 09:03:47 -0000 1.8 --- newbasket2.tmpl 20 Feb 2004 02:49:26 -0000 1.9 *************** *** 4,16 **** ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! "> ! //images/1uparrow.png" border=0 align=right alt="View Basket">
    > --- 4,16 ---- ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! "> ! //images/1uparrow.png" border=0 align=right alt="View Basket"> > Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** supplier.tmpl 11 Feb 2004 09:03:47 -0000 1.9 --- supplier.tmpl 20 Feb 2004 02:49:26 -0000 1.10 *************** *** 25,29 **** Postal Address ! --- 25,29 ---- Postal Address ! *************** *** 99,103 **** Active ! Inactive --- 99,103 ---- Active ! Inactive From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.16,1.17 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/circ Modified Files: circulation.tmpl Log Message: Make the translation tool happier. Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** circulation.tmpl 11 Feb 2004 09:03:46 -0000 1.16 --- circulation.tmpl 20 Feb 2004 02:49:26 -0000 1.17 *************** *** 242,246 **** CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment ! --- 242,246 ---- CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment ! > From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport AcceptMarcUpload.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/marcimport Modified Files: AcceptMarcUpload.tmpl Log Message: Make the translation tool happier. Index: AcceptMarcUpload.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AcceptMarcUpload.tmpl 9 Dec 2003 10:29:03 -0000 1.2 --- AcceptMarcUpload.tmpl 20 Feb 2004 02:49:27 -0000 1.3 *************** *** 23,27 **** ! Name this set of MARC records: --- 23,27 ---- ! "> Name this set of MARC records: From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes opac-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/includes Modified Files: opac-top.inc Log Message: Make the translation tool happier. Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** opac-top.inc 9 Dec 2003 10:29:04 -0000 1.7 --- opac-top.inc 20 Feb 2004 02:49:27 -0000 1.8 *************** *** 23,27 **** --> ! --- 23,27 ---- --> !
    *************** *** 75,78 **** !
    --- 75,78 ---- !
    From acli at users.sourceforge.net Fri Feb 20 03:49:30 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members jmemberentry.tmpl,1.8,1.9 memberentry.tmpl,1.22,1.23 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/members Modified Files: jmemberentry.tmpl memberentry.tmpl Log Message: Make the translation tool happier. Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** jmemberentry.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- jmemberentry.tmpl 20 Feb 2004 02:49:27 -0000 1.9 *************** *** 31,35 ****
    --- 61,65 ---- Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** detail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 --- detail.tmpl 20 Feb 2004 02:49:26 -0000 1.11 *************** *** 15,19 ****

    &bib=&bi=">http://
    &bib=&bi=">http://
    ! ! ! !
    --- 15,19 ----

    ! ! ! ! ! ! ! !
    Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** moredetail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 --- moredetail.tmpl 20 Feb 2004 02:49:26 -0000 1.11 *************** *** 18,22 **** > > ! --- 18,22 ---- > > !
    *************** *** 27,31 **** bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    //images/fileopen.png"> ! //images/edittrash.png">
    --- 27,31 ----     		//images/fileopen.png"> ! //images/edittrash.png">
    Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** searchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.8 --- searchresults.tmpl 20 Feb 2004 02:49:26 -0000 1.9 *************** *** 62,70 ****
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    ! &=&type=opacintra>Previous Records   --- 62,70 ----
    ! ! bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif">
    ! &=&type=opacintra">Previous Records   *************** *** 73,77 **** ! &=&type=opacintra>Next Records   --- 73,77 ---- ! &=&type=opacintra">Next Records   From acli at users.sourceforge.net Fri Feb 20 03:49:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,1.18,1.19 categoryitem.tmpl,1.8,1.9 checkmarc.tmpl,1.7,1.8 koha2marclinks.tmpl,1.10,1.11 marc_subfields_structure.tmpl,1.24,1.25 marctagstructure.tmpl,1.20,1.21 thesaurus.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/parameters Modified Files: authorised_values.tmpl categoryitem.tmpl checkmarc.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl thesaurus.tmpl Log Message: Make the translation tool happier. Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** authorised_values.tmpl 11 Feb 2004 09:02:55 -0000 1.18 --- authorised_values.tmpl 20 Feb 2004 02:49:27 -0000 1.19 *************** *** 2,6 **** !

    --- 2,6 ---- !

    *************** *** 30,34 **** ! --- 30,34 ---- !
    *************** *** 47,51 **** !

    Authorised values admin

    --- 47,51 ---- !

    Authorised values admin

    Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** categoryitem.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- categoryitem.tmpl 20 Feb 2004 02:49:27 -0000 1.9 *************** *** 288,292 **** ! ! ! Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** checkmarc.tmpl 11 Feb 2004 09:02:55 -0000 1.7 --- checkmarc.tmpl 20 Feb 2004 02:49:27 -0000 1.8 *************** *** 6,10 **** ! --- 6,10 ---- ! *************** *** 19,23 **** ! --- 19,23 ---- ! *************** *** 33,37 **** ! --- 33,37 ---- ! *************** *** 45,49 **** ! --- 45,49 ---- ! *************** *** 59,63 **** ! --- 59,63 ---- ! *************** *** 71,75 **** ! --- 71,75 ---- ! *************** *** 85,89 **** ! --- 85,89 ---- ! *************** *** 99,103 **** ! --- 99,103 ---- ! *************** *** 114,118 **** ! --- 114,118 ---- ! Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** koha2marclinks.tmpl 11 Feb 2004 09:02:55 -0000 1.10 --- koha2marclinks.tmpl 20 Feb 2004 02:49:28 -0000 1.11 *************** *** 2,11 **** !

    Choose and validate 1 of the following for .

    EditDelete --- 288,293 ---- EditDelete
    Result
    Result
    ! ! ! --- 21,29 ---- ! ! From acli at users.sourceforge.net Sun Feb 22 07:46:26 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 22:46:26 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.17,1.18 intranet.zh_TW,1.4,1.5 xgettext.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13681 Modified Files: TmplTokenizer.pm intranet.zh_TW xgettext.pl Log Message: Templates with French characters were not handled properly in the install step. This is now fixed. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** TmplTokenizer.pm 22 Feb 2004 05:18:52 -0000 1.17 --- TmplTokenizer.pm 22 Feb 2004 06:46:15 -0000 1.18 *************** *** 536,540 **** $s =~ s/([\\"])/\\\1/gs; $s =~ s/\n/\\n/g; ! $s =~ s/[\177-\377]/ sprintf("\\%03o", ord($&)) /egs; return "\"$s\""; } --- 536,540 ---- $s =~ s/([\\"])/\\\1/gs; $s =~ s/\n/\\n/g; ! #$s =~ s/[\177-\377]/ sprintf("\\%03o", ord($&)) /egs; return "\"$s\""; } *************** *** 581,584 **** --- 581,621 ---- } + use vars qw( @latin1_utf8 ); + @latin1_utf8 = ( + "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", + "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", + "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", + "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", + "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", + "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", + "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", + "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", + "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", + "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", + "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", + "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", + "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", + "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", + "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", + "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", + "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", + "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", + "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", + "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", + "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", + "\303\276", "\303\277" ); + + sub charset_convert ($$$) { + my($s, $charset_in, $charset_out) = @_; + if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now + ; + } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { + $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; + } elsif ($charset_in ne $charset_out) { + VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; + } + return $s; + } + ############################################################################### Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** intranet.zh_TW 20 Feb 2004 09:32:14 -0000 1.4 --- intranet.zh_TW 22 Feb 2004 06:46:16 -0000 1.5 *************** *** 4,7 **** --- 4,10 ---- # Copyright 2004 Ambrose Li # + # FIXME words tentatively translated: active, illustration, illustrator, inactive + # FIXME "request", "reserve" should be é ç´„ [http://www.tpml.edu.tw/chinese/service/service.htm] + # msgid "" msgstr "" *************** *** 39,52 **** [...3717 lines suppressed...] - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:43 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:44 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:45 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:46 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:47 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:48 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:49 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 - msgid "||" - msgstr "||" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 --- 7096,7099 ---- *************** *** 7221,7222 **** --- 7108,7110 ---- "Help" msgstr "" + Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** xgettext.pl 22 Feb 2004 05:18:52 -0000 1.2 --- xgettext.pl 22 Feb 2004 06:46:17 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- use vars qw( $convert_from ); use vars qw( $files_from $directory $output $sort ); + use vars qw( $extract_all_p ); use vars qw( $pedantic_p ); use vars qw( %text %translation ); *************** *** 21,59 **** ############################################################################### ! use vars qw( @latin1_utf8 ); ! @latin1_utf8 = ( ! "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", ! "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", ! "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", ! "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", ! "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", ! "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", ! "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", ! "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", ! "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", ! "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", ! "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", ! "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", ! "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", ! "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", ! "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", ! "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", ! "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", ! "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", ! "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", ! "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", ! "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", ! "\303\276", "\303\277" ); ! ! sub charset_convert ($) { ! my($s) = @_; ! if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now ! ; ! } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { ! $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; ! } elsif ($charset_in ne $charset_out) { ! VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; ! } ! return $s; } --- 22,37 ---- ############################################################################### ! sub negligible_p ($) { ! my($t) = @_; # a string ! # Don't emit pure whitespace, pure numbers, pure punctuation, ! # single letters, or TMPL_VAR's. ! # Punctuation should arguably be translated. But without context ! # they are untranslatable. ! return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR ! || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\.,:;'"%\(\)\[\]\|]+$/ # pure punctuation w/o context ! || $t =~ /^[A-Za-z]$/ # single letters ! ); } *************** *** 118,125 **** sub generate_strings_list () { # Emit all extracted strings. - # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (string_list) { ! printf OUTPUT "%s\n", $t ! unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } --- 96,101 ---- sub generate_strings_list () { # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t unless negligible_p($t); } } *************** *** 152,156 **** my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; my $cformat_p; for my $token (@{$text{$t}}) { --- 128,132 ---- my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { *************** *** 162,166 **** } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( charset_convert $t ); printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? TmplTokenizer::quote_po( $translation{$t} ): "\"\""); --- 138,143 ---- } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po ! TmplTokenizer::charset_convert $t, $charset_in, $charset_out; printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? TmplTokenizer::quote_po( $translation{$t} ): "\"\""); *************** *** 201,204 **** --- 178,182 ---- } } + # The following assumption is correct; that's what HTML::Template assumes if (!defined $charset_in) { $charset_in = $charset_out = TmplTokenizer::charset_canon 'iso8859-1'; *************** *** 224,227 **** --- 202,206 ---- HTML::Template options: + -a, --extract-all Extract all strings --pedantic-warnings Issue warnings even for detected problems which are likely to be harmless *************** *** 249,252 **** --- 228,232 ---- Getopt::Long::config qw( bundling no_auto_abbrev ); GetOptions( + 'a|extract-all' => \$extract_all_p, 'charset=s' => sub { $charset_in = $charset_out = $_[1] }, # INTERNAL 'convert-from=s' => \$convert_from, From acli at users.sourceforge.net Sun Feb 22 08:00:19 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 23:00:19 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15661 Modified Files: TmplTokenizer.pm Log Message: Ugly hack to get rid of the close tag in pathetic "foo %s"-like strings Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** TmplTokenizer.pm 22 Feb 2004 06:46:15 -0000 1.18 --- TmplTokenizer.pm 22 Feb 2004 07:00:16 -0000 1.19 *************** *** 486,489 **** --- 486,503 ---- push @{$this->{_queue}}, pop @structure; } + # FIXME: If the last token is a close tag but there are no tags + # FIXME: before it, drop the close tag back into the queue. This + # FIXME: is an ugly hack to get rid of "foo %s" type mess. + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TAG + && $structure[$#structure]->string =~ /^<\//) { + my $has_other_tags_p = 0; + for (my $i = 0; $i < $#structure; $i += 1) { + $has_other_tags_p = 1 + if $structure[$i]->type == TmplTokenType::TAG; + last if $has_other_tags_p; + } + push @{$this->{_queue}}, pop @structure unless $has_other_tags_p + } if (@structure < 2) { # Nothing to do From acli at users.sourceforge.net Sun Feb 22 09:18:30 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:18:30 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.19,1.20 tmpl_process3.pl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27216 Modified Files: TmplTokenizer.pm tmpl_process3.pl Log Message: The French character handling fix for tmpl_process3 was not checked in for some reason. Try to remove trailing ( in strings too. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** TmplTokenizer.pm 22 Feb 2004 07:00:16 -0000 1.19 --- TmplTokenizer.pm 22 Feb 2004 08:18:27 -0000 1.20 *************** *** 443,446 **** --- 443,482 ---- } + sub _optimize { + my $this = shift; + my @structure = @_; + my $undo_trailing_blanks = sub { + for (my $i = $#structure; $i >= 0; $i -= 1) { + last if $structure[$i]->type != TmplTokenType::TEXT; + last if !blank_p($structure[$i]->string); + push @{$this->{_queue}}, pop @structure; + } + }; + # FIXME: If the last token is a close tag but there are no tags + # FIXME: before it, drop the close tag back into the queue. This + # FIXME: is an ugly hack to get rid of "foo %s" type mess. + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TAG + && $structure[$#structure]->string =~ /^<\//s) { + my $has_other_tags_p = 0; + printf STDERR "last token %d is type %s: %s\n", $#structure, $structure[$#structure]->type->to_string, $structure[$#structure]->string; + for (my $i = 0; $i < $#structure; $i += 1) { + printf STDERR "token %d is type %s: %s\n", $i, $structure[$i]->type->to_string, $structure[$i]->string; + $has_other_tags_p = 1 if $structure[$i]->type == TmplTokenType::TAG; + last if $has_other_tags_p; + } + push @{$this->{_queue}}, pop @structure unless $has_other_tags_p; + &$undo_trailing_blanks; + } + # FIXME: Do the same ugly hack for the last token being a ( or [ + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TEXT + && $structure[$#structure]->string =~ /^[\(\[]$/) { # not )] + push @{$this->{_queue}}, pop @structure; + &$undo_trailing_blanks; + } + return @structure; + } + sub next_token { my $this = shift; *************** *** 486,503 **** push @{$this->{_queue}}, pop @structure; } ! # FIXME: If the last token is a close tag but there are no tags ! # FIXME: before it, drop the close tag back into the queue. This ! # FIXME: is an ugly hack to get rid of "foo %s" type mess. ! if (@structure >= 2 ! && $structure[$#structure]->type == TmplTokenType::TAG ! && $structure[$#structure]->string =~ /^<\//) { ! my $has_other_tags_p = 0; ! for (my $i = 0; $i < $#structure; $i += 1) { ! $has_other_tags_p = 1 ! if $structure[$i]->type == TmplTokenType::TAG; ! last if $has_other_tags_p; ! } ! push @{$this->{_queue}}, pop @structure unless $has_other_tags_p ! } if (@structure < 2) { # Nothing to do --- 522,526 ---- push @{$this->{_queue}}, pop @structure; } ! @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** tmpl_process3.pl 22 Feb 2004 05:18:52 -0000 1.3 --- tmpl_process3.pl 22 Feb 2004 08:18:27 -0000 1.4 *************** *** 34,37 **** --- 34,38 ---- my($s) = @_; my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; + $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); return defined $href->{$key} && !$href->{$key}->fuzzy *************** *** 147,150 **** --- 148,154 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; + # try to make sure .po files are backed up (see BUGS) + $ENV{VERSION_CONTROL} = 't'; + # keep the buggy Locale::PO quiet if it says stupid things $SIG{__WARN__} = sub { *************** *** 320,323 **** --- 324,330 ---- dependent commands are present. + If xgettext.pl is interrupted by the user, a corrupted po file + will result. This is very seriously wrong. + Locale::PO(3) has a lot of bugs. It can neither parse nor generate GNU PO files properly; a couple of workarounds have From acli at users.sourceforge.net Sun Feb 22 09:49:34 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:34 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305/members Modified Files: moremember.tmpl Log Message: Grammatical correction Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** moremember.tmpl 11 Feb 2004 09:02:55 -0000 1.25 --- moremember.tmpl 22 Feb 2004 08:49:32 -0000 1.26 *************** *** 137,145 **** ! ! ! ! ! --- 137,145 ---- ! ! ! ! ! From acli at users.sourceforge.net Sun Feb 22 09:49:35 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters thesaurus.tmpl,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305/parameters Modified Files: thesaurus.tmpl Log Message: Grammatical correction Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** thesaurus.tmpl 20 Feb 2004 02:49:28 -0000 1.19 --- thesaurus.tmpl 22 Feb 2004 08:49:32 -0000 1.20 *************** *** 88,92 **** "> ! --- 88,92 ---- "> ! *************** *** 99,103 ****

    Manages thesaurus and authorities files.

      ! Dig: see data depending of this one
      Related: see other forms of this authority entry

    --- 99,103 ----

    Manages thesaurus and authorities files.

      ! Dig: see data depending on this one
      Related: see other forms of this authority entry

    From acli at users.sourceforge.net Sun Feb 22 09:49:34 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:34 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305 Modified Files: request.tmpl Log Message: Grammatical correction Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** request.tmpl 11 Feb 2004 09:01:41 -0000 1.11 --- request.tmpl 22 Feb 2004 08:49:31 -0000 1.12 *************** *** 44,53 ****
    --- 2,11 ---- !

    Choose and validate 1 of the following for .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    *************** *** 20,24 ****
    --- 20,24 ----
    *************** *** 33,37 ****
    --- 33,37 ----
    *************** *** 46,50 ****
    --- 46,50 ----
    *************** *** 59,63 ****
    --- 59,63 ----
    *************** *** 72,76 ****
    --- 72,76 ----
    *************** *** 85,89 ****
    --- 85,89 ----
    *************** *** 98,102 ****
    --- 98,102 ----
    *************** *** 111,115 ****
    --- 111,115 ----
    *************** *** 124,128 ****
    --- 124,128 ----
    *************** *** 153,157 **** ! MARC links --- 153,157 ---- ! MARC links Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** marc_subfields_structure.tmpl 11 Feb 2004 09:02:55 -0000 1.24 --- marc_subfields_structure.tmpl 20 Feb 2004 02:49:28 -0000 1.25 *************** *** 5,9 **** !

    --- 5,9 ---- !

    *************** *** 44,48 **** ! --- 44,48 ---- !
    *************** *** 59,70 **** ! Data deleted ! ' method=post>"> !

    MARC subfield structure admin for

    *************** *** 77,87 **** ! ! ! ! ! ! ! --- 77,87 ---- ! ! ! ! ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** marctagstructure.tmpl 9 Dec 2003 10:29:01 -0000 1.20 --- marctagstructure.tmpl 20 Feb 2004 02:49:28 -0000 1.21 *************** *** 53,57 **** !

    --- 53,57 ---- !

    *************** *** 71,75 **** !
    Lib Koha field ?Rep ?Mand ?Tab ?Auth value ?Thesaurus ?Val build ?Delete
    Lib Koha field ?Rep ?Mand ?Tab ?Auth value ?Thesaurus ?Val build ?Delete
    --- 71,75 ---- !
    *************** *** 84,88 **** ! Data deleted --- 84,88 ---- ! Data deleted *************** *** 91,95 **** !

    MARC tag structure admin

    --- 91,95 ---- !

    MARC tag structure admin

    Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** thesaurus.tmpl 11 Feb 2004 09:02:55 -0000 1.18 --- thesaurus.tmpl 20 Feb 2004 02:49:28 -0000 1.19 *************** *** 2,6 **** ! Thesaurus management
    --- 2,6 ---- ! Thesaurus management
    *************** *** 34,38 **** !

    ModifyAdd

    --- 34,38 ---- !

    ModifyAdd

    *************** *** 75,79 **** !
    --- 75,79 ---- !
    *************** *** 94,98 **** !

    Thesaurus management

    --- 94,98 ---- !

    Thesaurus management

    From acli at users.sourceforge.net Fri Feb 20 04:01:23 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en default.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941 Modified Files: default.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/default.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** default.tmpl 11 Feb 2004 09:01:41 -0000 1.3 --- default.tmpl 20 Feb 2004 03:01:21 -0000 1.4 *************** *** 24,28 ****

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    From acli at users.sourceforge.net Fri Feb 20 04:01:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbookfund.tmpl,1.20,1.21 aqbudget.tmpl,1.21,1.22 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/parameters Modified Files: aqbookfund.tmpl aqbudget.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** aqbookfund.tmpl 9 Dec 2003 10:29:00 -0000 1.20 --- aqbookfund.tmpl 20 Feb 2004 03:01:21 -0000 1.21 *************** *** 5,9 **** !
    You Searched for


    --- 5,9 ---- !
    You Searched for


    Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** aqbudget.tmpl 11 Feb 2004 09:02:55 -0000 1.21 --- aqbudget.tmpl 20 Feb 2004 03:01:21 -0000 1.22 *************** *** 5,9 **** !
    You Searched for


    --- 5,9 ---- !
    You Searched for


    From acli at users.sourceforge.net Fri Feb 20 04:01:23 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/acqui Modified Files: acquire.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** acquire.tmpl 11 Feb 2004 09:03:47 -0000 1.8 --- acquire.tmpl 20 Feb 2004 03:01:21 -0000 1.9 *************** *** 147,151 **** ! --- 147,151 ---- ! From acli at users.sourceforge.net Fri Feb 20 04:01:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes issues-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/includes Modified Files: issues-top.inc Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** issues-top.inc 11 Feb 2004 09:02:56 -0000 1.7 --- issues-top.inc 20 Feb 2004 03:01:21 -0000 1.8 *************** *** 240,266 **** --- 240,267 ---- *************** *** 271,301 **** --- 272,302 ---- *************** *** 326,331 ****
    !

    Logged in as: [Log Out]

    !

    Log In to Koha

    --- 327,332 ----
    !

    Logged in as: [Log Out]

    !

    Log In to Koha

    From acli at users.sourceforge.net Fri Feb 20 05:38:05 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 20:38:05 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.13,1.14 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18383 Modified Files: TmplTokenizer.pm Log Message: Support %0.0s notation so that we can omit the %s as in Year%s for the Chinese translation. (This won't work for all languages; ultimately the English templates must be fixed.) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** TmplTokenizer.pm 20 Feb 2004 02:48:39 -0000 1.13 --- TmplTokenizer.pm 20 Feb 2004 04:38:02 -0000 1.14 *************** *** 546,554 **** $fmt = $'; $it .= '%'; ! } elsif ($fmt =~ /^%(?:(\d+)\$)?s/) { $n += 1; ! my $i = (defined $1? $1: $n) - 1; $fmt = $'; ! $it .= $params[$i] } elsif ($fmt =~ /^%[^%a-zA-Z]*[a-zA-Z]/) { $fmt = $'; --- 546,560 ---- $fmt = $'; $it .= '%'; ! } elsif ($fmt =~ /^%(?:(\d+)\$)?(?:(\d+)(?:\.(\d+))?)?s/) { $n += 1; ! my($i, $width, $prec) = ((defined $1? $1: $n), $2, $3); $fmt = $'; ! if (!defined $width && !defined $prec) { ! $it .= $params[$i] ! } elsif (defined $width && defined $prec && !$width && !$prec) { ! ; ! } else { ! die "Unsupported precision specification in format: $&\n"; #XXX ! } } elsif ($fmt =~ /^%[^%a-zA-Z]*[a-zA-Z]/) { $fmt = $'; From acli at users.sourceforge.net Fri Feb 20 05:38:38 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 20:38:38 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,NONE,1.1 opac.zh_TW,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18555 Added Files: intranet.zh_TW opac.zh_TW Log Message: Preliminary checkin --- NEW FILE --- # Koha INTRANET module, traditional Chinese translation # Copyright (C) 2000-2004 Katipo Communications # This file is distributed under the same license as the Koha package. # Copyright 2004 Ambrose Li # msgid "" msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-19 17:20-0500\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl:29 #, c-format msgid "\" %s" [...7251 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:33 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:34 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:36 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:37 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:38 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:39 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:40 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:41 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:42 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:43 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:44 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:45 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:46 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:47 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:48 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:49 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" msgstr "" --- NEW FILE --- # Koha OPAC module, traditional Chinese translation # Copyright (C) 2000-2004 Katipo Communications # This file is distributed under the same license as the Koha package. # Copyright 2004 Ambrose Li # msgid "" msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:10 #, c-format msgid "" [...975 lines suppressed...] msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc:8 msgid "||" msgstr "" #~ msgid "BARCODE" #~ msgstr "æ¢ç¢¼" #~ msgid "Notes:" #~ msgstr "備註：" #~ msgid "Pages:" #~ msgstr "é æ•¸ï¼š" #~ msgid "Year :" #~ msgstr "年：" #~ msgid "You have" #~ msgstr "您有" From acli at users.sourceforge.net Fri Feb 20 07:16:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 22:16:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1235/koha-tmpl/intranet-tmpl/default/en Modified Files: about.tmpl Log Message: Minor capitalization correction Index: about.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** about.tmpl 9 Dec 2003 10:28:57 -0000 1.7 --- about.tmpl 20 Feb 2004 06:16:28 -0000 1.8 *************** *** 41,45 **** Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray and Turo Technology LLP, england (quality control, installer & updater)
    Nicolas Morin, French Translation
    --- 41,45 ---- Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray and Turo Technology LLP, England (quality control, installer & updater)
    Nicolas Morin, French Translation
    From acli at users.sourceforge.net Fri Feb 20 08:04:15 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:04:15 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.1,1.2 opac.zh_TW,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9425 Modified Files: intranet.zh_TW opac.zh_TW Log Message: Updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.zh_TW 20 Feb 2004 04:38:36 -0000 1.1 --- intranet.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 *************** *** 36,40 **** #, c-format msgid "$%s" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:15 --- 36,40 ---- #, c-format msgid "$%s" ! msgstr "$%s" [...3835 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:37 msgid "z3950 search" ! msgstr "z3950查詢" #: ../../koha-tmpl/intranet-tmpl/default/en/searchheader.tmpl:1 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl:6 msgid "|" ! msgstr "|" #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:9 *************** *** 7288,7290 **** #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" ! msgstr "" --- 7292,7294 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" ! msgstr "||" Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac.zh_TW 20 Feb 2004 04:38:36 -0000 1.1 --- opac.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 *************** *** 457,461 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:9 msgid "FINES & CHARGES" ! msgstr "罰款åŠå…¶ä»–費用" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 457,461 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:9 msgid "FINES & CHARGES" ! msgstr "罰款åŠè²»ç”¨" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 From acli at users.sourceforge.net Fri Feb 20 08:13:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:13:24 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10716 Modified Files: intranet.zh_TW Log Message: Minor update (after changing TmplTokenizer.pm) Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** intranet.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 --- intranet.zh_TW 20 Feb 2004 07:13:21 -0000 1.3 *************** *** 2640,2644 **** #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:5 ! msgid "Data about the current version of Koha for bug reports (or general" msgstr "" --- 2640,2646 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:5 ! msgid "" ! "Data about the current version of Koha for bug reports (or general\n" ! "interest)." msgstr "" *************** *** 3286,3300 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:17 - msgid "Help" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:78 msgid "Henri-Damien Laurent" --- 3288,3291 ---- *************** *** 3574,3581 **** msgstr "借出" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:91 - msgid "Issues:" - msgstr "借出：" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:47 msgid "Issuing Question" --- 3565,3568 ---- *************** *** 3829,3833 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:166 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:78 msgid "Koha field" --- 3816,3819 ---- *************** *** 5488,5495 **** msgstr "還書" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:54 - msgid "Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine" - msgstr "Richard Andersonã€Jeremy Blakeã€Rebecca Holdenã€Olive T. Canine" - #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:50 msgid "Rick Hansen Library" --- 5474,5477 ---- *************** *** 5986,5990 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 ! msgid "The column" msgstr "" --- 5968,5976 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 ! msgid "" ! "The column Koha field shows that the subfield is linked with a Koha " ! "field. Koha can manage a MARC interface, or a Koha interface. This link " ! "ensures that both DB are synchronized, thus you can change from a MARC to a " ! "Koha interface easily." msgstr "" *************** *** 6172,6179 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:87 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:90 msgid "Total" msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:32 --- 6158,6170 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:87 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:17 msgid "Total" msgstr "" + #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:90 + msgid "" + "Total\n" + "Issues:" + msgstr "總借出：" + #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:32 *************** *** 6597,6601 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:10 ! msgid "You must create a new group for your item to be" msgstr "" --- 6588,6594 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:10 ! msgid "" ! "You must create a new group for your item to be\n" ! "added to" msgstr "" *************** *** 6691,6698 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:11 - msgid "added to" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:15 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:39 --- 6684,6687 ---- *************** *** 6703,6710 **** msgid "" "and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay " ! "Thompson, Gynn Lomax," msgstr "" "ä»¥åŠ Simon Blakeã€Amanda Atkins (é‹ä½œç¶“ç†)ã€Olwen Williamsã€Finlay Thompsonã€" ! "Gynn Lomaxã€" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90 --- 6692,6700 ---- msgid "" "and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay " ! "Thompson, Gynn Lomax,\n" ! "\t\t\t\t\t\tRichard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine" msgstr "" "ä»¥åŠ Simon Blakeã€Amanda Atkins (é‹ä½œç¶“ç†)ã€Olwen Williamsã€Finlay Thompsonã€" ! "Gynn Lomaxã€Richard Andersonã€Jeremy Blakeã€Rebecca Holdenã€Olive T. Canine" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90 *************** *** 6867,6874 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:6 - msgid "interest)." - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:28 #, c-format --- 6857,6860 ---- *************** *** 7060,7064 **** #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:90 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:93 - #, fuzzy msgid "search" msgstr "查詢" --- 7046,7049 ---- *************** *** 7068,7078 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 - msgid "" - "shows that the subfield is linked with a Koha field. Koha can manage a MARC " - "interface, or a Koha interface. This link ensures that both DB are " - "synchronized, thus you can change from a MARC to a Koha interface easily." - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:60 msgid "slip" --- 7053,7056 ---- *************** *** 7207,7211 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:10 --- 7185,7188 ---- *************** *** 7215,7219 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:10 --- 7192,7195 ---- *************** *** 7223,7227 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:10 --- 7199,7202 ---- *************** *** 7231,7235 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:10 --- 7206,7209 ---- *************** *** 7239,7243 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc:11 --- 7213,7216 ---- *************** *** 7249,7253 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:10 --- 7222,7225 ---- *************** *** 7257,7261 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:10 --- 7229,7232 ---- *************** *** 7265,7269 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:26 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:27 --- 7236,7239 ---- *************** *** 7293,7294 **** --- 7263,7278 ---- msgid "||" msgstr "||" + + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 + msgid "" + "|| \n" + "Help" + msgstr "" + From acli at users.sourceforge.net Fri Feb 20 08:10:05 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:10:05 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.14,1.15 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10129 Modified Files: TmplTokenizer.pm Log Message: Partially allow combination of several TEXT tokens. It seems that this gives better strings. (Always allowing combinations gives havoc, we currently avoid this by allowing combination only if the first and last tokens are both TEXT.) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** TmplTokenizer.pm 20 Feb 2004 04:38:02 -0000 1.14 --- TmplTokenizer.pm 20 Feb 2004 07:09:47 -0000 1.15 *************** *** 491,498 **** $it->set_form( $form ); $it->set_children( @structure ); ! # } elsif ($nonblank_text_p) { ! # # Combine the strings ! # my $string = join('', map { $_->string } @structure); ! # ; } else { # Requeue the tokens thus seen for re-emitting --- 491,498 ---- $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p && $structure[0]->type == TmplTokenType::TEXT && $structure[$#structure]->type == TmplTokenType::TEXT) { ! # Combine the strings ! my $string = join('', map { $_->string } @structure); ! $it = TmplToken->new($string, TmplTokenType::TEXT, $it->line_number, $it->pathname);; } else { # Requeue the tokens thus seen for re-emitting From acli at users.sourceforge.net Fri Feb 20 08:25:41 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:25:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac.zh_TW,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12550 Modified Files: opac.zh_TW Log Message: Minor updates Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 --- opac.zh_TW 20 Feb 2004 07:25:38 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- "(%s)" msgstr "" + "%s\n" + "(%s)" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:11 *************** *** 59,63 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 msgid "©" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 --- 61,65 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 msgid "©" ! msgstr "©" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 *************** *** 81,84 **** --- 83,88 ---- "%s    " msgstr "" + "æ¢ç¢¼\n" + "%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 *************** *** 145,149 **** #, c-format msgid "ISBN: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 --- 149,153 ---- #, c-format msgid "ISBN: %s" ! msgstr "國際標準書號：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 *************** *** 155,179 **** #, c-format msgid "Item Type: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:79 #, c-format msgid "Item lost: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:37 #, c-format msgid "LCCN: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 ! #, fuzzy, c-format msgid "Last Borrower 1: %s" ! msgstr "最近借出：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:76 ! #, fuzzy, c-format msgid "Last Borrower 2: %s" ! msgstr "最近借出：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:73 --- 159,183 ---- #, c-format msgid "Item Type: %s" ! msgstr "圖書資料類別：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:79 #, c-format msgid "Item lost: %s" ! msgstr "éºå¤±åœ–書資料：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:37 #, c-format msgid "LCCN: %s" ! msgstr "LCCN: %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 ! #, c-format msgid "Last Borrower 1: %s" ! msgstr "最近借書之讀者1：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:76 ! #, c-format msgid "Last Borrower 2: %s" ! msgstr "最近借書之讀者2：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:73 *************** *** 202,206 **** #, c-format msgid "Notes: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:41 --- 206,210 ---- #, c-format msgid "Notes: %s" ! msgstr "備註：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:41 *************** *** 287,291 **** #, c-format msgid "Year : %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:51 --- 291,295 ---- #, c-format msgid "Year : %s" ! msgstr "年份：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:51 *************** *** 487,495 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:89 ! msgid "Issues:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 --- 491,495 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" ! msgstr "繪圖" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 *************** *** 640,644 **** "keyword will be used" msgstr "" ! "注æ„：在一旦輸入了「關éµå­—ã€ï¼Œå³ä½¿åœ¨å…¶ä»–欄ä½è¼¸å…¥äº†å…¶ä»–查詢æ¢ä»¶ï¼Œä¹Ÿåªæœƒä½¿ç”¨é—œéµå­—。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:105 --- 640,645 ---- "keyword will be used" msgstr "" ! "注æ„：在一旦輸入了「關éµå­—ã€ï¼Œå³ä½¿åœ¨å…¶ä»–欄ä½è¼¸å…¥äº†å…¶ä»–查詢æ¢ä»¶ï¼Œä¹Ÿåªæœƒä½¿ç”¨é—œ" ! "éµå­—。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:105 *************** *** 840,845 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 ! msgid "Total" ! msgstr "總共" #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 --- 841,848 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 ! msgid "" ! "Total\n" ! "Issues:" ! msgstr "借書總次數：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 *************** *** 912,923 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:90 ! #, fuzzy, c-format msgid "You have %s items currently issued." ! msgstr "您沒有借出任何圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:117 ! #, fuzzy, c-format msgid "You have %s items currently reserved." ! msgstr "您沒有借出任何圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:112 --- 915,926 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:90 ! #, c-format msgid "You have %s items currently issued." ! msgstr "您目å‰å€Ÿäº† %s 項圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:117 ! #, c-format msgid "You have %s items currently reserved." ! msgstr "您目å‰é è¨‚了 %s 項圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:112 *************** *** 944,948 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:10 msgid "Young Adult Fiction" ! msgstr "é’å¹´å°èªª" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 --- 947,951 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:10 msgid "Young Adult Fiction" ! msgstr "é’å¹´å°èªªé¡ž" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 *************** *** 984,988 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 msgid "search" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 --- 987,991 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 msgid "search" ! msgstr "查詢" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 *************** *** 999,1014 **** msgstr "" - #~ msgid "BARCODE" - #~ msgstr "æ¢ç¢¼" - - #~ msgid "Notes:" - #~ msgstr "備註：" - - #~ msgid "Pages:" - #~ msgstr "é æ•¸ï¼š" - - #~ msgid "Year :" - #~ msgstr "年：" - - #~ msgid "You have" - #~ msgstr "您有" --- 1002,1003 ---- From acli at users.sourceforge.net Fri Feb 20 08:52:35 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:52:35 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16902 Modified Files: TmplTokenizer.pm Log Message: Fixed bug where a #cdata on one line won't be scanned properly. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** TmplTokenizer.pm 20 Feb 2004 07:09:47 -0000 1.15 --- TmplTokenizer.pm 20 Feb 2004 07:52:32 -0000 1.16 *************** *** 323,332 **** for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { ! if ($this->_peek_readahead =~ /^$cdata_close/) { ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_set_readahead( $' ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $this->_pop_readahead); $ok_p = 1; } --- 323,337 ---- for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { ! my $next = $this->_pop_readahead; ! if ($next =~ /^$cdata_close/) { ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_push_readahead( $' ); ! $ok_p = 1; ! } elsif ($next =~ /^((?:(?!$cdata_close).)+)($cdata_close)/) { ! ($kind, $it) = (TmplTokenType::TEXT, $1); ! $this->_push_readahead( "$2$'" ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $next); $ok_p = 1; } *************** *** 447,451 **** } else { $it = $this->_next_token_intermediate($h); ! if ($this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? !blank_p( $it->string ): _token_groupable_p( $it ))) { --- 452,456 ---- } else { $it = $this->_next_token_intermediate($h); ! if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? !blank_p( $it->string ): _token_groupable_p( $it ))) { From acli at users.sourceforge.net Fri Feb 20 10:32:18 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Fri, 20 Feb 2004 01:32:18 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3527 Modified Files: intranet.zh_TW Log Message: Updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** intranet.zh_TW 20 Feb 2004 07:13:21 -0000 1.3 --- intranet.zh_TW 20 Feb 2004 09:32:14 -0000 1.4 *************** *** 18,22 **** #, c-format msgid "\" %s" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:41 --- 18,22 ---- #, c-format msgid "\" %s" ! msgstr "\" %s" [...1688 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl:6 *************** *** 7159,7163 **** #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:218 msgid "update" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:108 --- 7104,7108 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:218 msgid "update" ! msgstr "æ›´æ–°" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:108 *************** *** 7276,7278 **** "Help" msgstr "" - --- 7221,7222 ---- From tipaul at users.sourceforge.net Fri Feb 20 11:35:02 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 20 Feb 2004 02:35:02 -0800 Subject: [Koha-cvs] CVS: koha/C4 Catalogue.pm,1.38,1.39 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15487/C4 Modified Files: Catalogue.pm Log Message: bugfix (wrong synch with rel_2_0) Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** Catalogue.pm 11 Feb 2004 08:40:10 -0000 1.38 --- Catalogue.pm 20 Feb 2004 10:34:59 -0000 1.39 *************** *** 99,114 **** my ($basketno,$supplier)=@_; my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblio,biblioitems ! where basketno=? and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber =aqorders.biblioitemnumber and (datecancellationprinted is NULL or datecancellationprinted = ! '0000-00-00')" ! .(($supplier ne '')?" and aqorders.booksellerid=?":"") ! ." group by aqorders.ordernumber"); ! if ($supplier ne '') { ! $sth->execute($basketno,$supplier); ! } else { ! $sth->execute($basketno); } $query.=" order by biblioitems.publishercode"; --- 99,110 ---- my ($basketno,$supplier)=@_; my $dbh = C4::Context->dbh; ! my $query="Select *,biblio.title from aqorders,biblio,biblioitems ! where basketno='$basketno' and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber =aqorders.biblioitemnumber and (datecancellationprinted is NULL or datecancellationprinted = ! '0000-00-00')"; ! if ($supplier ne ''){ ! $query.=" and aqorders.booksellerid='$supplier'"; } $query.=" order by biblioitems.publishercode"; *************** *** 119,126 **** my $i=0; while (my $data=$sth->fetchrow_hashref){ ! push(@results,$data); } $sth->finish; ! return(scalar(@results), at results); } --- 115,123 ---- my $i=0; while (my $data=$sth->fetchrow_hashref){ ! $results[$i]=$data; ! $i++; } $sth->finish; ! return($i, at results); } From kb2qzv at poczta.wp.pl Fri Feb 20 13:39:22 2004 From: kb2qzv at poczta.wp.pl (Benedykt P. Barszcz) Date: Fri, 20 Feb 2004 13:39:22 +0100 Subject: [Koha-cvs] npl theme gorgeuos Message-ID: <1077280762.3248.17.camel@localhost.localdomain> Hi, gorgeous gorgeous gorgeous it is !!! Congrats on the new theme for the intranet interface. What I love out right is the explanation column... It's really informative. I didn't have a chance to find bugs but I like it a lot. thanks for this. I will work on translating it soon. Benedict From kb2qzv at users.sourceforge.net Sat Feb 21 14:07:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 05:07:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl subject.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16316/koha-tmpl/opac-tmpl/default/pl Modified Files: subject.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- subject.tmpl 21 Feb 2004 13:07:55 -0000 1.3 *************** *** 1,44 **** ! ! ! !

    Zalogowano jako: [Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! !
    ! !
    AUTHOR QtyRecieved
    AUTHOR QtyReceived
    ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Przedmiot
    >
     

    ! Trafienia od do z rekordów.
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Przedmiot
    ">
     

    ! Rekordy od do z znalezionych.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From kb2qzv at users.sourceforge.net Sat Feb 21 16:49:50 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 07:49:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl subject.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14054/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 subject.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- subject.tmpl 21 Feb 2004 15:49:48 -0000 1.2.2.1 *************** *** 1,44 **** ! ! ! !

    Zalogowano jako: [Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    ! ! !
    ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Przedmiot
    >
     

    ! Trafienia od do z rekordów.
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Przedmiot
    ">
     

    ! Rekordy od do z znalezionych.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From kb2qzv at users.sourceforge.net Sat Feb 21 16:50:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 07:50:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-userupdate.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14233/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-userupdate.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-userupdate.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-userupdate.tmpl 21 Feb 2004 15:50:54 -0000 1.3.2.1 *************** *** 1,56 **** ! ! !

    Zalogowano jako: [Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! Proszê nanie¶æ potrzebne zmiany. Biblioteka otrzyma wiadomo¶æ e-mailem.
    ! Zmiany te nie uka¿± siê dopóki biblioteka ich nie zatwierdzi..

    ! !
    !
    ! ! ! ! ! ! ! ! ! - - ! ! ! ! - - ! ! ! !
    Nazwisko
    Tytu³
    Imiê
    Ulica
    Miasto
    Tel. domowy
    Tel./Fax w pracy
    Email
    !
    !
    !
    !     ! ! \ No newline at end of file --- 1,47 ---- ! !

    Prosimy wprowadzić konieczne zmiany. Biblioteka otrzyma powiadomienie listem elektronicznym.
    ! Zmiany ukażą się dopiero po uwierzytelnieniu ich przez Bibliotekę.

    ! !
    ! ! ! ! ! ! ! ! ! ! ! + + ! ! ! ! + + + !
    Nazwisko " name="surname">
    Tytuł " name="title">
    ImiÄ™ " name="firstname">
    Adres " name="streetaddress">
    Miasto " name="city">
    Tel. domowy " name="phone">
    Tel/fax praca " name="faxnumber">
    Email " name="emailaddress">
    !
    ! ! From acli at users.sourceforge.net Sun Feb 22 06:18:55 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 21:18:55 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.16,1.17 tmpl_process3.pl,1.2,1.3 xgettext.pl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31961 Modified Files: TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Handle the iso8859-1 charset somewhat, so that when the po file is in either iso8859-1 or utf8, msgmerge(1) won't crap out. The code is ugly; the conversion table is hard-coded, and in some place not very appropriate. However, this does fix the case where a few strings containing French characters can't be translated. As a side effect, tmpl_process3 can now also be used for French or other languages using iso8859-1. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** TmplTokenizer.pm 20 Feb 2004 07:52:32 -0000 1.16 --- TmplTokenizer.pm 22 Feb 2004 05:18:52 -0000 1.17 *************** *** 540,544 **** } ! # Complication function that shouldn't be here sub parametrize ($@) { my($fmt, @params) = @_; --- 540,544 ---- } ! # Some functions that shouldn't be here... should be moved out some time sub parametrize ($@) { my($fmt, @params) = @_; *************** *** 573,576 **** --- 573,584 ---- } + sub charset_canon ($) { + my($charset) = @_; + $charset = uc($charset); + $charset = "$1-$2" if $charset =~ /^(ISO|UTF)(\d.*)/i; + $charset = 'Big5' if $charset eq 'BIG5'; # "Big5" must be in mixed case + return $charset; + } + ############################################################################### Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** tmpl_process3.pl 19 Feb 2004 21:28:14 -0000 1.2 --- tmpl_process3.pl 22 Feb 2004 05:18:52 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- use vars qw( $href ); use vars qw( $type ); # file extension (DOS form without the dot) to match + use vars qw( $charset_in $charset_out ); ############################################################################### *************** *** 99,103 **** } - # FIXME: Should we use the GNOME convention of using POTFILES.in instead? sub listfiles ($$) { my($dir, $type) = @_; --- 100,103 ---- *************** *** 147,150 **** --- 147,156 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; + # keep the buggy Locale::PO quiet if it says stupid things + $SIG{__WARN__} = sub { + my($s) = @_; + print STDERR $s unless $s =~ /^Strange line in [^:]+: #~/s + }; + my $action = shift or usage_error('You must specify an ACTION.'); usage_error('You must at least specify input and string list filenames.') *************** *** 180,192 **** } if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; ! system {'./xgettext.pl'} ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; --- 186,221 ---- } + # restores the string list from file + $href = Locale::PO->load_file_ashash($str_file); + + # guess the charsets. HTML::Templates defaults to iso-8859-1 + if (defined $href) { + $charset_out = TmplTokenizer::charset_canon $2 + if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/; + for my $msgid (keys %$href) { + if ($msgid =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/) { + my $candidate = TmplTokenizer::charset_canon $2; + die "Conflicting charsets in msgid: $charset_in vs $candidate\n" + if defined $charset_in && $charset_in ne $candidate; + $charset_in = $2; + } + } + } + if (!defined $charset_in) { + $charset_in = TmplTokenizer::charset_canon 'iso8859-1'; + warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n"; + } + if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); + # Generate the temporary file that acts as /POTFILES.in for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; ! # Generate the specified po file ($str_file) ! system ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; *************** *** 195,203 **** my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; ! system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2); system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; --- 224,239 ---- my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name + # Generate the temporary file that acts as /POTFILES.in for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; ! # Generate the temporary file that acts as /.pot ! system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2, ! (defined $charset_in? ('-I', $charset_in): ()), ! (defined $charset_out? ('-O', $charset_out): ())); ! # Merge the temporary "pot file" with the specified po file ($str_file) ! # FIXME: msgmerge(1) is a Unix dependency ! # FIXME: need to check the return value system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; *************** *** 222,228 **** close INPUT; - # restores the string list from file - $href = Locale::PO->load_file_ashash($str_file); - # creates the new tmpl file using the new translation for my $input (@in_files) { --- 258,261 ---- Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** xgettext.pl 19 Feb 2004 21:24:30 -0000 1.1 --- xgettext.pl 22 Feb 2004 05:18:52 -0000 1.2 *************** *** 13,19 **** use VerboseWarnings; use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); ! use vars qw( %text ); ############################################################################### --- 13,60 ---- use VerboseWarnings; + use vars qw( $convert_from ); use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); ! use vars qw( %text %translation ); ! use vars qw( $charset_in $charset_out ); ! ! ############################################################################### ! ! use vars qw( @latin1_utf8 ); ! @latin1_utf8 = ( ! "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", ! "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", ! "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", ! "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", ! "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", ! "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", ! "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", ! "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", ! "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", ! "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", ! "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", ! "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", ! "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", ! "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", ! "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", ! "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", ! "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", ! "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", ! "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", ! "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", ! "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", ! "\303\276", "\303\277" ); ! ! sub charset_convert ($) { ! my($s) = @_; ! if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now ! ; ! } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { ! $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; ! } elsif ($charset_in ne $charset_out) { ! VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; ! } ! return $s; ! } ############################################################################### *************** *** 88,91 **** --- 129,134 ---- sub generate_po_file () { # We don't emit the Plural-Forms header; it's meaningless for us + my $pot_charset = (defined $charset_out? $charset_out: 'CHARSET'); + $pot_charset = TmplTokenizer::charset_canon $pot_charset; print OUTPUT <\\n" "MIME-Version: 1.0\\n" ! "Content-Type: text/plain; charset=CHARSET\\n" "Content-Transfer-Encoding: 8bit\\n" --- 146,150 ---- "Language-Team: LANGUAGE \\n" "MIME-Version: 1.0\\n" ! "Content-Type: text/plain; charset=$pot_charset\\n" "Content-Transfer-Encoding: 8bit\\n" *************** *** 114,123 **** my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; ! printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( $t ); ! printf OUTPUT "msgstr \"\"\n\n"; } } --- 157,207 ---- my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; ! printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number ! if defined $pathname && defined $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( charset_convert $t ); ! printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? ! TmplTokenizer::quote_po( $translation{$t} ): "\"\""); ! } ! } ! ! ############################################################################### ! ! sub convert_translation_file () { ! open(INPUT, "<$convert_from") || die "$convert_from: $!\n"; ! VerboseWarnings::set_input_file_name $convert_from; ! while () { ! chomp; ! my($msgid, $msgstr) = split(/\t/); ! die "$convert_from: $.: Malformed tmpl_process input (no tab)\n" ! unless defined $msgstr; ! ! # Fixup some of the bad strings ! $msgid =~ s/^SELECTED>//; ! ! # Create dummy token ! my $token = TmplToken->new( $msgid, TmplTokenType::UNKNOWN, undef, undef ); ! remember( $token, $msgid ); ! $msgstr =~ s/^(?:LIMIT;|LIMITED;)//g; # unneeded for tmpl_process3 ! $translation{$msgid} = $msgstr unless $msgstr eq '*****'; ! ! if ($msgid =~ /\bcharset=(["']?)([^;\s"']+)\1/s) { ! my $candidate = TmplTokenizer::charset_canon $2; ! die "Conflicting charsets in msgid: $candidate vs $charset_in\n" ! if defined $charset_in && $charset_in ne $candidate; ! $charset_in = $candidate; ! } ! if ($msgstr =~ /\bcharset=(["']?)([^;\s"']+)\1/s) { ! my $candidate = TmplTokenizer::charset_canon $2; ! die "Conflicting charsets in msgid: $candidate vs $charset_out\n" ! if defined $charset_out && $charset_out ne $candidate; ! $charset_out = $candidate; ! } ! } ! if (!defined $charset_in) { ! $charset_in = $charset_out = TmplTokenizer::charset_canon 'iso8859-1'; ! warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n"; } } *************** *** 165,171 **** --- 249,259 ---- Getopt::Long::config qw( bundling no_auto_abbrev ); GetOptions( + 'charset=s' => sub { $charset_in = $charset_out = $_[1] }, # INTERNAL + 'convert-from=s' => \$convert_from, 'D|directory=s' => \$directory, 'f|files-from=s' => \$files_from, + 'I|input-charset=s' => \$charset_in, # INTERNAL 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, + 'O|output-charset=s' => \$charset_out, # INTERNAL 'output|o=s' => \$output, 's|sort-output' => sub { $sort = 's' }, *************** *** 177,183 **** VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') unless defined $files_from; $directory = '.' unless defined $directory; if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; --- 265,275 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') ! unless defined $files_from || defined $convert_from; $directory = '.' unless defined $directory; + usage_error('You cannot specify both --convert-from and --files-from') + if defined $convert_from && defined $files_from; + if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; *************** *** 186,198 **** } ! open(INPUT, "<$files_from") || die "$files_from: $!\n"; ! while () { ! chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); ! $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! text_extract( $h ); } - close INPUT; generate_po_file; --- 278,294 ---- } ! if (defined $files_from) { ! open(INPUT, "<$files_from") || die "$files_from: $!\n"; ! while () { ! chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); ! $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! text_extract( $h ); ! } ! close INPUT; ! } else { ! convert_translation_file; } generate_po_file; From acli at users.sourceforge.net Sun Feb 22 07:04:08 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 22:04:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_105.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6386 Modified Files: unimarc_field_105.tmpl Log Message: Some French letters were ? Index: unimarc_field_105.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** unimarc_field_105.tmpl 11 Feb 2004 09:01:41 -0000 1.2 --- unimarc_field_105.tmpl 22 Feb 2004 06:04:05 -0000 1.3 *************** *** 12,19 ****
    Code date publication --- 12,19 ----
    Code date publication *************** *** 21,29 ****
    Ann?e d?but ">
    Ann?e fin ">
    Année début ">
    Année fin ">
    /images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
    /images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
    CONFIRM DELETION of this entry and all entries depending from this one
    CONFIRM DELETION of this entry and all entries depending on this one
    ! ! ! ! ! ! --- 44,53 ----
    /images/background-mem.gif">Request/images/background-mem.gif">Item type/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! ! ! ! ! From acli at users.sourceforge.net Sun Feb 22 10:04:58 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 01:04:58 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.20,1.21 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2759 Modified Files: TmplTokenizer.pm Log Message: Try to relax the criteria for allowing groups of tokens without TMPL_VAR to be combined together into one string. This seems to have the desired effect (that "foo bar" type strings are now recognized in one piece). However, "

    foo

    \nexplanation"-type things may now also be (arguably wrongly) recognized as one piece. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** TmplTokenizer.pm 22 Feb 2004 08:18:27 -0000 1.20 --- TmplTokenizer.pm 22 Feb 2004 09:04:53 -0000 1.21 *************** *** 460,466 **** && $structure[$#structure]->string =~ /^<\//s) { my $has_other_tags_p = 0; - printf STDERR "last token %d is type %s: %s\n", $#structure, $structure[$#structure]->type->to_string, $structure[$#structure]->string; for (my $i = 0; $i < $#structure; $i += 1) { - printf STDERR "token %d is type %s: %s\n", $i, $structure[$i]->type->to_string, $structure[$i]->string; $has_other_tags_p = 1 if $structure[$i]->type == TmplTokenType::TAG; last if $has_other_tags_p; --- 460,464 ---- *************** *** 479,482 **** --- 477,504 ---- } + sub looks_plausibly_like_groupable_text_p (@) { + my @structure = @_; + # The text would look plausibly groupable if all open tags are also closed. + my @tags = (); + my $error_p = 0; + for (my $i = 0; $i <= $#structure; $i += 1) { + if ($structure[$i]->type == TmplTokenType::TAG) { + if ($structure[$i]->string =~ /^<([A-Z0-9]+)/i) { + push @tags, lc($1); + } elsif ($structure[$i]->string =~ /^<\/([A-Z0-9]+)/i) { + if (@tags && lc($1) eq $tags[$#tags]) { + pop @tags; + } else { + $error_p = 1; + } + } + } elsif ($structure[$i]->type != TmplTokenType::TEXT) { + $error_p = 1; + } + last if $error_p; + } + return !$error_p && !@tags; + } + sub next_token { my $this = shift; *************** *** 484,487 **** --- 506,512 ---- my $it; $this->{_queue} = [] unless defined $this->{_queue}; + + # Don't reparse anything in the queue. We can put a parametrized token + # there if we need to, however. if (@{$this->{_queue}}) { $it = pop @{$this->{_queue}}; *************** *** 533,537 **** $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p && $structure[0]->type == TmplTokenType::TEXT && $structure[$#structure]->type == TmplTokenType::TEXT) { # Combine the strings my $string = join('', map { $_->string } @structure); --- 558,564 ---- $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p ! && looks_plausibly_like_groupable_text_p( @structure ) ! && $structure[$#structure]->type == TmplTokenType::TEXT) { # Combine the strings my $string = join('', map { $_->string } @structure); From kb2qzv at users.sourceforge.net Sun Feb 22 18:06:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:06:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-search.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7734/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-search.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-search.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-search.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-search.tmpl 22 Feb 2004 17:06:55 -0000 1.3.2.1 *************** *** 1,92 **** ! ! !

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! !
    !
    !
    /images/background-mem.gif">Request/images/background-mem.gif">Item type/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! -
    S³owa kluczowe
    LUB :
    Przedmiot
    LUB jedno albo wiêcej z :
    Tytu³NormalnePrecyzyjne
    Autor
    Ilustrator
    Klasa ! !
    Kod kreskowy
    Zauwa¿, ¿e je¶li wpiszesz jak±¶ warto¶æ do S³owa kluczowe, oraz inn± gdzie indziej to u¿yta zostanie jedynie warto¶æ S³owa kluczowego
    ! ! ! --- 1,71 ---- ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SÅ‚owo-kluczowe
    LUB :
    Przedmiot
    LUB jedno albo kilka z :
    TytułZwykłeDokładne
    Autor
    Ilustrator
    Typ ! !
    Kod paskowy
    Gdy wprowadzisz wartość w Słowo-klucz oraz wartość gdzie inndziej, to jedynie Słowo-klucz będzie wzięte pod uwagę
    ! !
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:06:33 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:06:33 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-user.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7631/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-user.tmpl 3 Oct 2003 20:04:18 -0000 1.4 --- opac-user.tmpl 22 Feb 2004 17:06:30 -0000 1.4.2.1 *************** *** 1,131 **** ! ! ! ! ! ! !
    CZY NASZ REKORD JEST POPRAWNY?
    ! Karta dostêpu:

    ! ()
    ! ,
    ! (dom)
    ! (praca)
    ! !

    ! ! Czy którekolwiek z naszych danych s± niepoprawne? Czy ostatnio przeprowadza³e¶/a¶ siê, zmieni³e¶/a¶ numer telefonu lub adres e-mail?

    ! ! Zaktualizuj dane ! !

    ! ! ! ! Witaj ! [Wyloguj siê]

    ! ! ! ! ! !
    ! Masz niezap³acone nale¿no¶ci i kary w wysoko¶ci !
    ! !     ! ! ! ! !
    Masz niezap³acone nale¿no¶ci i kary w wysoko¶ci !
    !     ! ! ! ! !
    Posiadasz kredyt na !
    !     ! Przegl±daj konta ! ! ! ! ! ! ! ! ! !
    ! Czekaj± na Ciebie zarezerwowane pozycje: !

    odbiór w:
    !     ! !

    ! ! ! ! Obecnie masz wypo¿yczonych pozycji
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    tytu³AutorDo zwrotuTyp pozycjiOp³atyBie¿±cy Status
    TakNieTakNie
    - - Nie masz ¿adnej wypo¿yczonej pozycji. -     - -

    - - - - - Obecnie masz zarezerwowan±(ych) pozycjê(i).
    - - - - - - - - - - - - - - - - - - -
    Tytu³AutorData rezerwacji
    -     ! --- 1,135 ---- ! ! ! ! ! ! ! ! !
    CZY NASZE DANE SÄ„ POPRAWNE?
    Numer karty:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !
    Zmieniło się coś?

    ! Wprowadź zmiany !     !
    + + + + + +
    + Masz outstanding charges and fines z +
    + + + + + + + +
    + + Masz outstanding charges and fines z + +
    + + + + + + + +
    + + Masz a credit z + +
    + +

    Przejrzyj rachunki

    + + + + + + + + + /images/background-opac.gif"> + + + + + + + + + + +
    + + Masz reserved items waiting: + +
    TytułAutorDzień rezerwacjiPick Up Branch
    + ">  +

     

    + + + + + + +

    Masz wypożyczone pozycje.

    + + /images/background-opac.gif"> + + + + + + + + + + + + + + + + + +
    TytułAutorZwrot dniaTypOpłatyKredyt
    "> YesNoYesNo
    + +

    Nie masz żadnych wypożycznych pozycji.

    + + + + +

    Masz zarezerwowane pozycje.

    + + /images/background-opac.gif"> + + + + + + + + + + + +
    TytułAutorDzień rezerwacji
    "> 
    + ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:26 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:26 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-reserve.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7894/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-reserve.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-reserve.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-reserve.tmpl 22 Feb 2004 17:07:23 -0000 1.4.2.1 *************** *** 1,112 **** ! !
    ! !

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! ! ! !
    ! Przepraszamy, nie mo¿esz z³ozyæ zamówienia poniewa¿ zalegasz na . ! Przepraszamy, nie mo¿esz z³o¿yæ wiêcej jak rezerwacji. ! Z³o¿y³e¶/a¶ ju¿ zamówienie na tê pozycjê. ! Musisz wybraæ przynajmniej jeden typ pozycji! ! Musisz podaæ oddzia³ do odbioru! !

    !     ! !

    Strona rezerwacji dla pozycji: ( )

    !

    Z³o¿ono ju¿ zamówieñ na tê pozycjê.

    !

    Prosimy wybraæ, który typ pozycji Ciê interesuje. Pierwsza z pozycji, która stanie siê dostêpna a nale¿y do jednego z tych typów zostanie dla Ciebie zatrzymana. ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ZamówienieTyp PozycjiEgzemplarze
    Rezerwacja nie mo¿liwa
    !

    ! Prosimy wybraæ oddzia³, z którego chcesz odebraæ pozycjê: !

    ! ! ! ! !
    Rezerwacja tego dnia: ! ! ! !
    Koniec rezerwacji tego dnia: ! ! ! !
    !

    ! !

    !     ! !

    Prosimy potwierdziæ, ¿e chcesz zamówiæ pozycjê typu:

    !

    ! ! ! ! ! ! ! ! ! ! !
    Typ Pozycji
    ! która ma byæ podjêta .
    ! ! !
    Uwaga, bêdzie pobrana op³ata w wysoko¶ci PLN
    !     ! !
    !     --- 1,113 ---- ! !
    ! ! !
    ! Sorry, you cannot make reserves because you owe .
    ! Sorry, you cannot make more than reserves.
    ! Już posiadasz rezerwację na tę pozycję.
    ! You must select at least one item type!
    ! You must select a branch for pickup!
    !
    ! ! !

    Strona rezerwacji dla pozycji: ( )

    !

    Istnieje rezerwacji na tÄ™ pozycjÄ™.

    !

    Prosimy wybrać żądany typ pozycji. Pierwszy z typów, który stanie się dostępny zostanie dla Ciebie zarezerwowany.

    ! !
    ! ! "> ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ZamówTyp pozycjiCopies
    ">Cannot be Reserved

    ! Prosimy wybrać oddział, z którego nastąpi odbiór pozycji: ! !

    ! ! ! ! !
    Rezerwacja tego dnia: ! ! ! !
    Rezygnacja tego dnia: ! ! ! !
    !

    !
    ! ! !

    Prosimy o potwierdzenie rezerwacji:

    !
    ! ! "> ! "> ! ! ! ! ! ! !
    /images/background-opac.gif">Typ pozycji
    ">
    ! której odbiór nastąpi z .
    ! "> ! !

    Uwaga, pobrana zostanie opłata w wysokości $

    ! ! !
    ! ! !
    + \ No newline at end of file From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:40 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-moredetail.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7970/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-moredetail.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-moredetail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-moredetail.tmpl 22 Feb 2004 17:07:37 -0000 1.4.2.1 *************** *** 1,53 **** !
    - -

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj]

    - -

    Zaloguj siê do Koha

    -     -
    ! ! ! ! &type=intra> ! ()

    ! > ! > --- 1,47 ---- !

    ! ! ! ! &type=intra> ! ()

    ! > ! >

    GROUP -
    ! !
    ! Biblionumber:
    ! Typ Pozycji:
    ! URL:
    ! Czas wypo¿yczenia:
    ! Op³ata za wypo¿yczenie:
    ! Klasyfikacja:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilustr:
    ! Rozmiar:
    ! Notki:
    ! Liczba pozycji:
    *************** *** 55,99 ****
    GROUP -
    ! !
    ! Biblionumber:
    ! Typ pozycji:
    ! URL:
    ! Loan Length:
    ! Rental Charge:
    ! Classification:
    ! ISBN:
    ! Publisher:
    ! Place:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Size:
    ! Notes:
    ! No. z Items:
    !     !
    BARCODE !
    ! > ! > ! > ! !
    ! Home Branch:
    ! Ostatnio zdano:
    ! Ostatnio po¿yczono:
    ! issue bit ! Ostatni czytelnik 1:
    ! Ostatni czytelnik 2:
    ! Bie¿±cy oddzia³:
    ! Cena wymiany:
    ! Pozycja zagubiona:
    ! Paid for:
    ! Notki:
    ! Przed³u¿enia:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Anulowano:
    &bi=&itm=>Total ! Issues:
    ! Group Number:
    ! Biblio number:
    --- 49,93 ----
    ! !
    BARCODE !
    ! > ! > ! > ! !
    ! Home Branch:
    ! Last seen:
    ! Last borrowed:
    ! on issue bit ! Last Borrower 1:
    ! Last Borrower 2:
    ! Current Branch:
    ! Replacement Price:
    ! Item lost:
    ! Paid for:
    ! Notes:
    ! Renewals:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Cancelled:
    &bi=&itm=>Total ! Issues:
    ! Group Number:
    ! Biblio number:
    *************** *** 104,108 ****
    !

    --- 98,102 ----

    !

    *************** *** 110,112 **** ! --- 104,106 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:54 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-main.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8003/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-main.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-main.tmpl 3 Oct 2003 20:04:18 -0000 1.4 --- opac-main.tmpl 22 Feb 2004 17:07:51 -0000 1.4.2.1 *************** *** 1,135 **** ! ! Katalog Publiczny systemu KOHA ! ! ! ! ! ! !

    ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Szukaj w Katalogu
       
    ! !
    ! ! Wype³nij pole i naci¶nij klawisz ENTER.
    ! ! ! -Wyszukiwanie zaawansowane (wiêcej opcji).
    ! ! !

    ! !

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj]

    ! !

    Zaloguj siê do Koha

    ! !
    ! !
    !

    !

    --- 1,128 ---- ! ! ! ! ! WELCOME TO THE KOHA OPAC + + ! ! ! !
    /images/front-background-med.gif"> ! /images/holder.gif" alt="" width="1" height="440" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/holder.gif" alt="" width="260" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="30" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="350" height="88" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" alt="" width="1" height="30" hspace="0" vspace="0" border="0"> ! ! !        /images/front-arrow.gif" alt="" border="0" width="27" height="22"> ! ! ! Szukaj w katalogu ! !
    ! !
    ! Wpisz słowo i naciśnij Enter.
    ! ! /images/front-arrow-small.gif" alt="-" width="20" height="16" hspace="0" vspace="0" border="0" align="middle"> ! Szukanie zaawansowane, więcej opcji ! !
    !
      !        /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! ! ! Nowe nabytki !
    !
    ! nabyte w ciÄ…gu ostatnich dni ! !
    !
      ! /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! ! !

    Zalogowano jako: [Twoje Konto][Wyloguj]

    ! !

    Zaloguj do Koha

    ! !
    ! ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:11 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-searchresults.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7831/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-searchresults.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-searchresults.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-searchresults.tmpl 22 Feb 2004 17:07:09 -0000 1.2.2.1 *************** *** 1,126 **** ! -
    - -

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj siê]

    - -

    Zaloguj siê do Koha

    -     - - - - Szuka³e¶ - - Nie poda³e¶/a¶ ¿adnych kryteriów wyszukiwania
    -     - - - znalezione trafienia -

    - - - - - &=>/images/numbers/prev.gif border=0> - - /images/numbers/placeholder.gif border=0> - - - - /images/numbers/-highlight.gif> - - &=>/images/numbers/.gif border=0> - - - - &=>/images/numbers/next.gif border=0> - - /images/numbers/placeholder.gif border=0> - - -

    - - - - - - - - - - /images/background-opac.gif> - - - - - - - /images/background-opac.gif> -
    Przedmiot
    >
    -  
    - - - - - - - /images/background-opac.gif> - - - - - - - - - - - - - - - - - - - - - /images/background-opac.gif> -
    Tytu³Autor©Ilo¶æ PozycjiLokalizacja 
    >> - >Zamówienie - - Nierezerwowalne - -
    - - /images/background-opac.gif> -
    - - &=>Rekordy poprzednie - -   - - - - - - &=>Rekordy nastêpne - -   - -
    -
    -     - -
    - Trafienia od do z rekordów. -

    - - - - Przepraszamy, nie znaleziono ¿adnych trafieñ
    - - Spróbuj kolejnej kwerendy - --- 1,132 ---- ! +
    + Szukano + + + nabyte w ciÄ…gu ostatnich dni
    + + You did not specify any search criteria
    + + + + znalezionych pozycji
    +
    + + +
    + + &=">/images/numbers/prev.gif" border="0" alt="Previous Page" height="14" width="15"> + + /images/numbers/placeholder.gif" height="14" width="15" alt="" border="0"> + + + + /images/numbers/-highlight.gif" alt="" height="14" width="15" border="0"> + + &=">/images/numbers/.gif" border="0" alt="" height="14" width="15"> + + + + &=">/images/numbers/next.gif" border="0" height="14" width="15" alt="Next Page"> + + /images/numbers/placeholder.gif" border="0" width="14" height="14" alt=""> +
    +
    + + + + + + + + + + /images/background-opac.gif"> + + + + + + + + /images/background-opac.gif"> + + +
    Przedmiot
    ">
    +   +
    + + + + + + + /images/background-opac.gif"> + + + + + + + + + + + + + + + + + + + + + + + /images/background-opac.gif"> + + +
    TytuÅ‚Autor©Liczba pozycjiLokalizacja 
    bgcolor="#ffffcc">">bgcolor="#ffffcc">">bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> + + ">Zamów + + Not Reservable + +
    + + /images/background-opac.gif"> + + + +
    + + &=">Previous Records + +   + + + + &=">Next Records + +   + +
    +
    + + +
    +
    Rekordy od do z znalezionych.
    +
    + + + +
    Nic nie znaleziono
    + + +
    Spróbuj innej kwerendy
    + From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:06 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-detail.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8060/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-detail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-detail.tmpl 22 Feb 2004 17:08:04 -0000 1.4.2.1 *************** *** 1,84 **** ! ! !

    Zalogowany jako: [Strony Cz³onkowskie][Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! !

    >Zamów

    !     ! ! ! () !

    ! ! !
    ! OPIS BIBLIO !
    ! ! Podtytu³: ! Autor: >
    ! Autor dodatkowy:
     ! Wydano przez : ! w ! , ! ,
    ! Collection:
    ! Has³o przedmiotowe:
    ! Rok :
    ! Uwagi:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL:
    ! ca³kowita liczba pozycji:
    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
    Witryna OnlineDostêpna
    !

    !

    !
    !

    ! --- 1,75 ---- ! ! !

    ">Zamów

    ! ! !

    !

    !

    ! !
    ! ( record )
    ! ! ISBN:">
    ! Subtitle:
    ! Autor: ">
    ! Additional Autor:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Przedmiot:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number z Items:
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Typ pozycjiLokalizacjaDate DueLast SeenKod paskowy
    Website OnlineAvailable 
    !

    !


    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:21 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-auth.tmpl,1.5,1.5.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8113/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-auth.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** opac-auth.tmpl 3 Oct 2003 20:04:18 -0000 1.5 --- opac-auth.tmpl 22 Feb 2004 17:08:19 -0000 1.5.2.1 *************** *** 1,49 **** ! ! !

    Przepraszamy, system KOHA uwa¿a, ¿e nie masz uprawnieñ do tej strony.

    ! ! !

    Przepraszamy, twoja sesja wygas³a, prosimy zalogowaæ siê ponownie.

    ! ! !

    Twój dostêp dokonuje siê z innego adresu IP! Prosimy zalogowaæ siê ponownie.

    ! ! !

    Wprowadzi³e¶ niepoprawne has³o lub nazwê, prosimy spróbowaæ ponownie.

    ! ! -
    !
    ! ! ! ! ! -
    ! ! ! ! ! !
    Koha - Wstêp
    NumerKarty:
    Has³o:
    -     		- - -
    ! --- 1,40 ---- ! ! !

    Sorry, KOHA doesnt think you have permission for this page.

    ! ! !

    Sorry, your session has timed out, please login again.

    ! ! !

    You are accessing koha from a different ip address! please login again.

    ! ! !

    Zł hasło lub użytkownik/numer karty. Spróbuj raz jeszcze.

    ! ! !
    " method="post"> ! ! " value=""> ! ! ! ! ! !

    Wejście do Systemu

    Numer Karty:
    Hasło:
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:35 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-account.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8176/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-account.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-account.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-account.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-account.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-account.tmpl 22 Feb 2004 17:08:32 -0000 1.2.2.1 *************** *** 1,39 **** ! ! ! Konto dla ! [ Pocz±tek][Wyloguj]

    ! !

    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    KARY I OP£ATYKWOTADO ZAP£ATY
    !
    W sumie
    !

     

    ! \ No newline at end of file --- 1,37 ---- ! ! !

    Rachunek dla

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-opac.gif" colspan="2">KARY & OPÅATY/images/background-opac.gif" colspan="1">KWOTA/images/background-opac.gif" colspan="1">POZOSTAÅO
    !
    Do zapłaty
    !

     

    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:47 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl kohaerror.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8240/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 kohaerror.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: kohaerror.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/kohaerror.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** kohaerror.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- kohaerror.tmpl 22 Feb 2004 17:08:44 -0000 1.2.2.1 *************** *** 1,17 **** ! ! !
    !
    ! ! !
    Wyst±pi³ b³±d
    -
    - ! --- 1,13 ---- ! !
    ! ! !
    An error has occurred
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:01 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes opac-top.inc,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8318/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 opac-top.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-top.inc,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-top.inc 1 Oct 2003 15:14:31 -0000 1.3 --- opac-top.inc 22 Feb 2004 17:08:59 -0000 1.3.2.1 *************** *** 1,70 **** ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! - - - - - - - - - - - - - - - - - - - - - - - - - ! !
    KOHA: Przeszukiwanie KataloguSearch - - Zapisy - - Pocz±tek
    KOHA
    - -
    - --- 1,48 ---- ! ! KOHA: OPAC Catalogue Search ! ! /includes/opac.css"> ! ! + + + + + + + + +
    + /images/front-background-small.gif" height="50" border="0" alt="">KOHA + + + Search + + + + Join + + + Home + +   +
    + + + + +

    Zalogowano jako: [Twoje Konto][Wyloguj]

    + +

    Zaloguj to Koha

    + From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:22 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes opac-bottom.inc,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8403/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 opac-bottom.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-bottom.inc,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-bottom.inc 1 Oct 2003 15:14:31 -0000 1.2 --- opac-bottom.inc 22 Feb 2004 17:09:19 -0000 1.2.2.1 *************** *** 1,32 ****
    - -

     

    -
    -
    ! ! ! ! Przeszukiwanie Katalogu || ! ! ! ! Pocz±tek ! ! -
    - - - --- 1,14 ----

     


    ! Catalogue Search || ! Home
    From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:35 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes cat-class-list.inc,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8512/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 cat-class-list.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: cat-class-list.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/cat-class-list.inc,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** cat-class-list.inc 6 Jan 2003 02:06:06 -0000 1.1 --- cat-class-list.inc 22 Feb 2004 17:09:33 -0000 1.1.2.1 *************** *** 1,4 **** --- 1,4 ---- From acli at users.sourceforge.net Sun Feb 22 22:34:44 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 13:34:44 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplToken.pm,1.3,1.4 TmplTokenizer.pm,1.21,1.22 tmpl_process3.pl,1.4,1.5 xgettext.pl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv471 Modified Files: TmplToken.pm TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Preliminary support for "analysis" of strings with tags. Early termination of analysis if we encounter some strings, such as

    or | or ||, in order to avoid extracting strings that are unnecessarily long and which doesn't add any meaningful context. Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TmplToken.pm 19 Feb 2004 21:24:30 -0000 1.3 --- TmplToken.pm 22 Feb 2004 21:34:40 -0000 1.4 *************** *** 89,92 **** --- 89,98 ---- # only meaningful for TEXT_PARAMETRIZED tokens + sub anchors { + my $this = shift; + return map { $_->type == TmplTokenType::TAG && $_->string =~ /^{'_kids'}}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens sub form { my $this = shift; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** TmplTokenizer.pm 22 Feb 2004 09:04:53 -0000 1.21 --- TmplTokenizer.pm 22 Feb 2004 21:34:40 -0000 1.22 *************** *** 421,431 **** } ! sub _token_groupable_p ($) { # groupable into a TEXT_PARAMETRIZED token my($t) = @_; ! return $t->type == TmplTokenType::TEXT || ($t->type == TmplTokenType::DIRECTIVE && $t->string =~ /^(?:$re_tmpl_var)$/os) || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<\/?(?:b|em|h[123456]|i|u)\b/is || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) --- 421,442 ---- } ! sub _token_groupable1_p ($) { # as first token, groupable into TEXT_PARAMETRIZED my($t) = @_; ! return ($t->type == TmplTokenType::TEXT && $t->string !~ /^[,\.:\|\s]+$/s) || ($t->type == TmplTokenType::DIRECTIVE && $t->string =~ /^(?:$re_tmpl_var)$/os) || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<(?:b|em|h[123456]|i|u)\b/is ! || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) ! } ! ! sub _token_groupable2_p ($) { # as other token, groupable into TEXT_PARAMETRIZED ! my($t) = @_; ! return ($t->type == TmplTokenType::TEXT && ($t->string =~ /^\s*$/s || $t->string !~ /^[\|\s]+$/s)) ! || ($t->type == TmplTokenType::DIRECTIVE ! && $t->string =~ /^(?:$re_tmpl_var)$/os) ! || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<\/?(?:a|b|em|h[123456]|i|u)\b/is || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) *************** *** 440,444 **** sub _formalize ($) { my($t) = @_; ! return $t->type == TmplTokenType::DIRECTIVE? '%s': _quote_cformat($t->string); } --- 451,458 ---- sub _formalize ($) { my($t) = @_; ! return $t->type == TmplTokenType::DIRECTIVE? '%s': ! $t->type == TmplTokenType::TAG? ! ($t->string =~ /^': _quote_cformat($t->string)): ! _quote_cformat($t->string); } *************** *** 453,456 **** --- 467,471 ---- } }; + &$undo_trailing_blanks; # FIXME: If the last token is a close tag but there are no tags # FIXME: before it, drop the close tag back into the queue. This *************** *** 515,558 **** if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? ! !blank_p( $it->string ): _token_groupable_p( $it ))) { my @structure = ( $it ); ! my($n_trailing_spaces, $next) = (0, undef); ! my($nonblank_text_p, $parametrized_p, $next) = (0, 0); if ($it->type == TmplTokenType::TEXT) { $nonblank_text_p = 1 if !blank_p( $it->string ); } elsif ($it->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; } ! for (my $i = 1, $n_trailing_spaces = 0;; $i += 1) { $next = $this->_next_token_intermediate($h); push @structure, $next; # for consistency (with initialization) ! last unless defined $next && _token_groupable_p( $next ); if ($next->type == TmplTokenType::TEXT) { ! if (blank_p( $next->string )) { ! $n_trailing_spaces += 1; ! } else { ! ($n_trailing_spaces, $nonblank_text_p) = (0, 1); ! } } elsif ($next->type == TmplTokenType::DIRECTIVE) { - $n_trailing_spaces = 0; $parametrized_p = 1; ! } else { ! $n_trailing_spaces = 0; } } # Undo the last token push @{$this->{_queue}}, pop @structure; ! # Undo trailing blank tokens ! for (my $i = 0; $i < $n_trailing_spaces; $i += 1) { ! push @{$this->{_queue}}, pop @structure; ! } @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do ; ! } elsif ($nonblank_text_p && $parametrized_p) { # Create the corresponding c-format string my $string = join('', map { $_->string } @structure); my $form = join('', map { _formalize $_ } @structure); $it = TmplToken->new($string, TmplTokenType::TEXT_PARAMETRIZED, $it->line_number, $it->pathname); $it->set_form( $form ); --- 530,583 ---- if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? ! !blank_p( $it->string ): _token_groupable1_p( $it ))) { my @structure = ( $it ); ! my @tags = (); ! my $next = undef; ! my($nonblank_text_p, $parametrized_p, $with_anchor_p) = (0, 0, 0); if ($it->type == TmplTokenType::TEXT) { $nonblank_text_p = 1 if !blank_p( $it->string ); } elsif ($it->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; + } elsif ($it->type == TmplTokenType::TAG && $it->string =~ /^<([A-Z0-9]+)/is) { + push @tags, lc($1); + $with_anchor_p = 1 if lc($1) eq 'a'; } ! # We hate | and || in msgid strings, so we try to avoid them ! for (my $i = 1, my $quit_p = 0, my $quit_next_p = ($it->type == TmplTokenType::TEXT && $it->string =~ /^\|+$/s);; $i += 1) { $next = $this->_next_token_intermediate($h); push @structure, $next; # for consistency (with initialization) ! last unless defined $next && _token_groupable2_p( $next ); ! last if $quit_next_p; if ($next->type == TmplTokenType::TEXT) { ! $nonblank_text_p = 1 if !blank_p( $next->string ); ! $quit_p = 1 if $next->string =~ /^\|+$/s; # We hate | and || } elsif ($next->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; ! } elsif ($next->type == TmplTokenType::TAG) { ! if ($next->string =~ /^<([A-Z0-9]+)/is) { ! push @tags, lc($1); ! $with_anchor_p = 1 if lc($1) eq 'a'; ! } elsif ($next->string =~ /^<\/([A-Z0-9]+)/is) { ! my $close = lc($1); ! $quit_p = 1 unless @tags && $close eq $tags[$#tags]; ! $quit_next_p = 1 if $close =~ /^h\d$/; ! pop @tags; ! } } + last if $quit_p; } # Undo the last token push @{$this->{_queue}}, pop @structure; ! # Simply it a bit more @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do ; ! } elsif ($nonblank_text_p && ($parametrized_p || $with_anchor_p)) { # Create the corresponding c-format string my $string = join('', map { $_->string } @structure); my $form = join('', map { _formalize $_ } @structure); + my $a_counter = 0; + $form =~ s// $a_counter += 1, "" /egs; $it = TmplToken->new($string, TmplTokenType::TEXT_PARAMETRIZED, $it->line_number, $it->pathname); $it->set_form( $form ); *************** *** 605,612 **** # Some functions that shouldn't be here... should be moved out some time ! sub parametrize ($@) { ! my($fmt, @params) = @_; my $it = ''; ! for (my $n = 0; length $fmt;) { if ($fmt =~ /^[^%]+/) { $fmt = $'; --- 630,637 ---- # Some functions that shouldn't be here... should be moved out some time ! sub parametrize ($$$) { ! my($fmt_0, $params, $anchors) = @_; my $it = ''; ! for (my $n = 0, my $fmt = $fmt_0; length $fmt;) { if ($fmt =~ /^[^%]+/) { $fmt = $'; *************** *** 620,624 **** $fmt = $'; if (!defined $width && !defined $prec) { ! $it .= $params[$i] } elsif (defined $width && defined $prec && !$width && !$prec) { ; --- 645,649 ---- $fmt = $'; if (!defined $width && !defined $prec) { ! $it .= $params->[$i] } elsif (defined $width && defined $prec && !$width && !$prec) { ; *************** *** 634,637 **** --- 659,678 ---- } } + for (my $n = 0, my $fmt = $it, $it = ''; length $fmt;) { + if ($fmt =~ /^(?:(?!).)+/is) { + $fmt = $'; + $it .= $&; + } elsif ($fmt =~ /^/is) { + $n += 1; + my $i = $1; + $fmt = $'; + my $anchor = $anchors->[$i - 1]; + warn_normal "$&: Anchor $1 not found for msgid \"$fmt_0\"", undef #FIXME + unless defined $anchor; + $it .= $anchor->string; + } else { + die "Completely confused decoding anchors: $fmt\n";#XXX + } + } return $it; } Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** tmpl_process3.pl 22 Feb 2004 08:18:27 -0000 1.4 --- tmpl_process3.pl 22 Feb 2004 21:34:40 -0000 1.5 *************** *** 89,96 **** } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); ! print $output TmplTokenizer::parametrize($fmt, map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? ! text_replace_tag($t, $attr): $t } $s->parameters); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); --- 89,96 ---- } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); ! print $output TmplTokenizer::parametrize($fmt, [ map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? ! text_replace_tag($t, $attr): $t } $s->parameters ], [ $s->anchors ]); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); *************** *** 298,302 **** This is an experimental version of the tmpl_process.pl script, ! using standard gettext-style PO files. Currently, the create, update, and install actions have all been --- 298,303 ---- This is an experimental version of the tmpl_process.pl script, ! using standard gettext-style PO files. Note that the behaviour ! of this script should still be considered unstable. Currently, the create, update, and install actions have all been *************** *** 316,321 **** The --help option has not been implemented yet. ! There are probably some real bugs too, since this has not been ! tested very much. xgettext.pl must be present in the current directory; the --- 317,328 ---- The --help option has not been implemented yet. ! If an extracted string contain actual text (versus tags or ! TMPL_VAR directives), the strings are extracted verbatim, ! resulting in unwieldy things like multiple spaces, tabs, ! and/or newlines which are semantically indistinguishable ! from single blanks. If the template writer changes the ! spacing just a little bit, the new formatting would be ! considered new strings. This is arguably wrong, and in any ! case counter-productive. xgettext.pl must be present in the current directory; the *************** *** 332,335 **** --- 339,345 ---- (e.g., to get rid of the "Strange line" warning for #~). + There are probably some other bugs too, since this has not been + tested very much. + =head1 SEE ALSO Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** xgettext.pl 22 Feb 2004 06:46:17 -0000 1.3 --- xgettext.pl 22 Feb 2004 21:34:40 -0000 1.4 *************** *** 22,37 **** ############################################################################### ! sub negligible_p ($) { my($t) = @_; # a string # Don't emit pure whitespace, pure numbers, pure punctuation, # single letters, or TMPL_VAR's. # Punctuation should arguably be translated. But without context ! # they are untranslatable. return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\.,:;'"%\(\)\[\]\|]+$/ # pure punctuation w/o context || $t =~ /^[A-Za-z]$/ # single letters ! ); } --- 22,51 ---- ############################################################################### ! sub string_negligible_p ($) { my($t) = @_; # a string # Don't emit pure whitespace, pure numbers, pure punctuation, # single letters, or TMPL_VAR's. # Punctuation should arguably be translated. But without context ! # they are untranslatable. Note that $t is a string, not a token object. return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\+\.,:;!\?'"%\(\)\[\]\|]+$/ # punctuation w/o context || $t =~ /^[A-Za-z]$/ # single letters ! ) ! } ! ! sub token_negligible_p( $ ) { ! my($x) = @_; ! my $t = $x->type; ! return !$extract_all_p && ( ! $t == TmplTokenType::TEXT? string_negligible_p( $x->string ): ! $t == TmplTokenType::DIRECTIVE? 1: ! $t == TmplTokenType::TEXT_PARAMETRIZED ! && join( '', map { my $t = $_->type; ! $t == TmplTokenType::DIRECTIVE? ! '1': $t == TmplTokenType::TAG? ! '': token_negligible_p( $_ )? ! '': '1' } @{$x->children} ) eq '' ); } *************** *** 40,45 **** sub remember ($$) { my($token, $string) = @_; ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; } --- 54,62 ---- sub remember ($$) { my($token, $string) = @_; ! # If we determine that the string is negligible, don't bother to remember ! unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; ! } } *************** *** 70,77 **** my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { - #$t = TmplTokenizer::trim $t; remember( $s, $t ) if $t =~ /\S/s; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { - #$t = TmplTokenizer::trim $t; remember( $s, $s->form ) if $s->form =~ /\S/s; } elsif ($kind eq TmplTokenType::TAG && %$attr) { --- 87,92 ---- *************** *** 97,101 **** # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t unless negligible_p($t); } } --- 112,116 ---- # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t # unless negligible_p($t); } } *************** *** 128,132 **** my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { --- 143,147 ---- my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! #next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { *************** *** 317,331 **** =back ! Right now it does about the same thing as text-extract2.pl but ! generates gettext-style output; however, because it is scanner- ! instead of parser-based, it is able to address the 4 weaknesses ! listed in translator_doc.txt. Ultimately, the goal is to make ! this able to do some kind of simple analysis on the input to ! produce gettext-style output with c-format strings, in order to ! facilitate translation to languages with a different word order ! than English. ! When the above is finished, the generated po file may contain ! some HTML tags in addition to %s strings. If you want to generate GNOME-style POTFILES.in files, such --- 332,340 ---- =back ! Note that this script is experimental and should still be ! considered unstable. ! Please refer to the explanation in tmpl_process3 for further ! details. If you want to generate GNOME-style POTFILES.in files, such From kb2qzv at users.sourceforge.net Sun Feb 22 23:01:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:01:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images/numbers - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images/numbers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7786/koha-tmpl/opac-tmpl/default/pl/images/numbers Log Message: Directory /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images/numbers added to the repository --> Using per-directory sticky tag `rel_2_0' From kb2qzv at users.sourceforge.net Sun Feb 22 23:38:51 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:38:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images background-mem.gif,NONE,1.1.2.1 background-opac.gif,NONE,1.1.2.1 clear-button.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15592/images Added Files: Tag: rel_2_0 background-mem.gif background-opac.gif clear-button.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a£ ¬@1 d' ®zÍξ“°}¥·ï÷Ç‚Á´éž4ƒ„ Uxj Žt”••Wd•dXv–•giŸŽ¨Xz ‡…€4‡µ·‰~ J¼½¾¿À½96®¸Ç€4†µÏÐÑÒÓÔÕÖ×ØÙÚÛÔÇ· 4hPK DÍD@@x›Y ÐQ möÈ·<à3QöÒÚq?®†N-oô¤ÒM`ÕqÔaQÀÿî5Ÿó±òQIáWÈ!¸IT‚[t\H´”Åï­áUO Ø ª²ÀD>caRK-Â@@¤ '„†@'qBÀ@¼UÒ€Ô ôãA D–’ @™#DõÊ:I¡‹®uéå—À4!&FØcæ™h¦©æšˆÊL&çœtÖiç‡PN ˆƒçŸ€*hdÌì §8ÌPÌ¢Œ6êè£F*餔Vj饘Bª%à§"ä“騤–jê£ÄœZi+›nš€,ìÓÎmžÕjë­¸VsËŒ¶a˜Èi­+ì°Äkì±È&[l11%£h4ÌVŒ<à8åÿµØf«í¶íA_lŽbÄèÕjˆ’€¢†´ˆGEèyU»î&çí0Z&À+†L™I,@ÀW¿9X/;±Ç…qð¹ÛV³µì»Ñ"¹9¥ƒVÂâÁ\) ^w%Ìñð- †ÂSX›€,&^—ÇZDXßlYæKËmìSÆݹì€f`ááLënÁ' Ì0ÐAKjúž\t+ïװϦ(îÚ^t½·†ÓW p³ÜJ·(tlÞm4 at H£‚SÕ  KëPe7{e)7vÛÌRU"s­}øæ€×YDóS×¥Ó¦x4à±ÁWX¹Ô«WÖÖœ;"î¢äÞx*›°—óÒ¥³40%z¡ö‚L€"‹P#x7ìœ_þí¦ÎC»¶s+Ð 8Á uš½õàc{oªážÜ¯Ó*«þúì·ï>±ÌE¡3¡ÉÊ­¸æ¯ÿþx]—ª p9Yy ÈÀ:°ZBÒ›h3¨ Zð‚‚"@edÀÁzðƒ a B From kb2qzv at users.sourceforge.net Sun Feb 22 23:39:29 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:39:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images front-arrow.gif,NONE,1.1.2.1 front-arrow-small.gif,NONE,1.1.2.1 front-background-med.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15728/images Added Files: Tag: rel_2_0 front-arrow.gif front-arrow-small.gif front-background-med.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a €ª=l Aœr¤?†h„†– ·¹Ë&! --- NEW FILE --- GIF89a   QU1‘’.…‡.„†X-XY.[*x|j4i<;2•–M%LO*O@B=B33HJJO*{| #$2–—-†‡ ,„$jm2“” (tv ]_h3h-„†)(g3hn7nk7k"dfP$M&nq! %gj^.]Z2Z ^5^j5j ?A/‹Œ  --- NEW FILE --- GIF89a ¸Äÿ sÏïûÿ€‚ƒ„…†‡$Rw i‘’“”•–—g wzˆ ¡¢£¤¥¦§¨†ŠŒS ˜²³´µ¶” T©¿ÀÁÂÃÄÅÆ,»S ·ÏÐÑÒϺVŸÇÙÚÛÜÝÞÛPV¯Óäåæç² V¾ßîïðñòó0ÉV ±èúûüýgÊ(´£G° ÁƒÿD`!¿‡#ò0¡Å‹3j$AÁŠ1CŠY.Àº)Ø6ÿª\ɲå¨E­ I³¦Íh &£o · s«í§GK°ÀÏ ³? óÌ5ÓL°²Ùj«²Ã@;,‡Pq’¬KX­7mÜ–QN2&š;€Œ4 Ž|dàÓ»ÈUÏ}ZUˆ7·Ñä„0ùKá$ƒ" ä`"ϸ3ȹ.m“ccöŋ €LyYO‚ìÈÉ'½ñ êG? Ò¡ô+Ÿd#äR×ú€ˆo\“©˜U#€Ð!UX`€ÍÂ4°úobjÊJY"5ˆl [—êÖÅ l«xUÀ¼0±hà^op€© ÊÕ,œô‡ÐŠÂ°0¡þõ´ª`‰zW<Ó|ˆ]«c+>Ú¶u|¶m¬Ít»XÝîö¶¸ nb%H3NŒ ¬jQËÜæŠ@µ ëD{-l1}ÿüìp·FŒ– zèh! Ô­ÔÍ2Jó|øýg 96„iÊTä­æ`Þó¢w½NpÚ+Ôèø½tˆïq'Lá [ØÂäÅCrl`óGÁ qq$à„x}¬ +ë$š»Î» î|,|$ÓT“„ÍøÔ~Ùó|28ŸŠÅ“¸Ãª|}V—çÌ¥V‚Ъ‘qšÜÐUczúâ6!dTgÅÈ¿lŽà|@tgM8ùÒ,Ü{¬½$-œÄœŠ$x~¹L¢ÜLi¤8SYÊhXH{7ý-ÿŒÐ…; žóÓ¬1àkKw:W³Òöx‚­£ÔryN ÎS,}™Ê 1ŸÒÎñÅZ­=2Æb¢&VÃõH‘jÉƧì˘Ñi­Ö§|‡“7ÎF4)  »¹uýÌ­Í`R~ìx,ö\:<;²c‚Í8‚tÑõe;ßÙG÷X{L1 yE+••Z)U5õ*eÁŸa‰¬¨ß1b5dUà5 ¿ðÇÈVÓ”:…Ñ&ŸU]Éû_ø4Qú¼`öÁŸ#œ‰§Žë¡y3G.û9$ïD±u¡¿û›ð¢ˆŸý*Ô›„%ÊÛÜ|Š¸/ßM0—£ÿ æ] 0Ę(Œ™%<œPL8UZ^bfjnrvz~‚†vFIMU©h¥‚­Žµž¹ÁƺABŠ¥È)$ _pûi´Ôg;§.>ýúö­1…ÂœJrܸQóSpiðÕJû¬çÿ_Y H/µÖÒ-|…üN¶Ô $kñÖg£í˜§0’@ÈbÃMs㬶Ýw+Õt / ·ßSÛLwÎx^¸7]çÃÀ 8‹(²BÀ‡@\bŽ:¨€Å1ŠGœ«¨#¶5àƒRÜ"Ä`ðY1ŒÒÿÛXÈÅ3Lw% ~2•®*€"YÊWrŽ%X ähU²ÒœZ¥§ ÝëGÉ&VÀòò® Ø)a=jÔÃ"6°VXlcy:Ì•B5²z¼«*KT‚S³ƒT¬^=‹R/’P´˜”àÞfÚŠ2ð§ªÕ£"ûÚÂB㯳µbm]{[†–ºÝ-¹ ÐßÆ4¬º$n%jVäu çv~xΕ òÚb2ë9kH6cŸÕ,=šr".t@·[åDÿ/MVp€’OŸÒ<;³¥ñ©Íéio„o§Û©_î†ÚÌÊq©¯™çT£mÔ­nç§áçcXï̹ž50/ûh\§LÒ% 5¯]mb`oÍÀÅÆ&A‘½5®. ÒËf¦£­5,«xÚ¶4Yj­­´ÿZÛ·ôµ·—fÞl‹û“¯.w®Wn` @¿fw½¸Ê€Ò¾û“¦÷¦¡î|#’ âŠnô¢¿›ÿ˺®„úï°= GŸú ``ý –¹Ÿ pcìÍÞ?âÿ‘à@ ¡A&äIzÆBjAú@8äCJâ8Äã,ŽÓŒF΋²U 7j](~# ˆdî߇B~Bå^,âÇHÂ$LÇ ÐÒLc3)ÿNæä-ndÀÝ@Z’2)¡PŠ£)åg äQ¢b2¤P>¥¤3ÚOÑ$µÅÁraå¸èä/P^Ov¡ý@ `Š!9b†TFw$æZª#¶á[¾e²<UÒâš5æ%¢8à ì£Ýuá¡@ Šæ`bAŽÄa"fZêE2¶%;Bæ[ª $iÇ!§Y"#('cdƒ:(„Be|À|úêe(¹dã짇ƒ"äFpöàHež&Š¦è‘Ž¡‰㈺g\J¨ èT…¢‘aáå† ÛüümáGrR;&ápgèx"iŠd1†cÂh$f"ÌeÖh=Z)ub Wþå:§ –%S–!™–d™"©Ÿ®"{®©3NâÑè]朒 ’ÙiÑÀWÃ>&Y¢)’i‹’㟠꠪çz>è¡ž ý8 ëSëªk ]æE¢k¡l(WniÑè)¦nŸ‰&¢avª½Žé)–ÇA’G``슦£®6%+ŽêkHûMJ$fì¡ÏÐ9+Àã#âj j½ jy\lU$„xŒ‡Î2b[¶$ºgTî"/‘£lʦ‰bqè–^PëâhÅúÿêTÇx„‡o\­xTÅ9¦£*®§—Šì$ÒÁÀ**í•*Ó«æËöUh:lš&·ªhrªÃÝòlÞÈÞbíbb«#2©ÈJY™íÿ8Úm¦mnª«ŽÀå1lâȬÜ'Ý&§fXÅåžÞî,p€Gdžà—þ«$Ž, @áÎC%.Žú›Žò¨Ĭ8ÞkÝ~GJnllíàmg`®UøíæǦi{ºãè*jev­jê† ¤*¬¬¢^E-©p¤¦yÞîÖÚîÞ&Döf¯×.Dk‚,d/ >F’û€tÍRÜ¢áü¦dýþFæòîóUøí®†mè fm pe¢_!p½0o0ðçÛF®Ü£yž¤ånnÈ ó¯9bíŠmø ¯+>ã°Í(ÛΩÙg ‡ ”µ/ÎÕ­‚ ÕJ… ï¯ÞÊ0çb0yhnÖ.g¨~¬H>dD–@ -ß‚ ©C#õ Ÿ²ÌJA£™êïN5ðε—stÖ¡”†±F3f7Ýd!ÀÛ®£Q³pæÅöÅL4Âu8`ƒJ2kO²c0#H6eÚaG e¯—mëŒ,e‘ üÉhfx9Ä®ìÚo ß8à à}¨¦Æ’6$Ÿ®ˆö_^|Ÿ]G¸OÓ¸½pÕ2\ÁnÇ/¿NïÇBiGöùÄÊ’x~÷+;úó´b8­8¿wéáuê¼\È]¹¹ù(#ä¸@)""¨s„% ^Þ}æ zš×ô\Oki˜JùÐ!ÂíLa IxžGÚ]ÅPÐî·˜öxõþ7ÿZè^¢Ë^»ŠÀí¥9 ®“tÇÝí É$oïx÷ö¦òö~tÀ{¼ÛÅ“éÑ|Öͼ®Ï]Îs|ÇKÝð€h<‰<á@¹¿.JǨ£¤DïìSÕài;á‰ÿÖͼÎSý®óü¥wqÐ?Û ^…ú!#ýöDßxx±ÄOüÍSýÕw|À}ÖÏ%}s½Ò@Á×iµÖìo»4`È8 :ØÉ<Îç¼Û_ºÇÛÎvÍxÝ){Þ³°‘ªt"—}‡«ÁVú྿>ÜËvêpË 4ãßÍDœ aöwy–ºXÜ8 TâØM}Û_½çÇ=÷ À¬œËV“>ÃéÇ\ÎÉßëjóëSÕìþ¿W»@'ü|ïSŽéŸ~À#Yï½J#{ëûÅßçí+¿ü\ ÿÔÿöùÛ=HbDF †6 öó:ò‰!j%0¦–‰8ÐZ`‘ÍHÂÂWHº£ägPž‰fšjŽ&e‡-‚xew[Îiœ ^¾ðe z"ç¡‹e6·f ‚JèJm戤•>”Iet¶(€Í๧žŒm–œ„yñSh§ž~ j0‡"Z% vf‰eAúà£:Pâ̤•fv)¦a,Çœ™¡îÊk¯¾òW $èø&%®¶ÚÓ*òtì±°Æg˜—¶Þx«°þŠm¶Ún»Æ¨P9¦:Û5›jw Øì«wÊú•‡&…k®ºrKo½özŠZ2×¹û^¦ž:£é¢ŠI€Î†¸›»¶J(¬¼÷> qăæÛ°^à"!Y€uy%wÛµúB»üR«@¼ò*qÊ*¯ìd¾ýäµïÈ÷;Ùo6ó&™Ì3ç\rÅ.£ÌrÐBáÏ0“0µÎÌtÓLçìŽÉ'ÃHtÕV_¥ÑmU,,^SPrظSò×ñê;u¾X¯ÍvÛøÝæË(Í-÷ËpÿìvÞzï]áÝ~ãÍwà‚ From kb2qzv at users.sourceforge.net Sun Feb 22 23:40:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:40:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images heading-login.gif,NONE,1.1.2.1 heading-member.gif,NONE,1.1.2.1 heading-search.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15862/images Added Files: Tag: rel_2_0 heading-login.gif heading-member.gif heading-search.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a& X‹wp¯<ß2j,¦D†vP|aŽ„ˆì\`µ¡¥Ë—0cÊœI³¦Í›8sêÜɳ§ÏÿŸ5ñÒ΀"ÚÌ9YtÉ€ ¢JJµªÕ«X³jÝʵ«×¯`ÊÛu…³^òÑòàÀ’$KÊ1b [SXbCݲX—  (¼£$" °DuZé^R‰Üj„ðÁ§IÕA]~p^t`&–£¥ ÄÚª§·–êÒ®½eì±ÇþÅ®§*%©tuñf•h¹eP‡T¢aà l<)³S5“mùå˜sU¯r÷eцÎJ:Ý”]!&ïT¦‡Øu«×zæˆ͹Xà;ÿ¿qø› V[tX°ÈH¬ä)NYW€ÄáP4ƒÿ"¼Ð€=Ôa Xà€´ !*Ex—®ï*³ta ð²«XîЖ™"`E ˜¨¨m± ÌžE»°)0©qÎ u‰ £rÞzåh&¦É„ÉÕ¼&¶fHBØlœÖ\Âpê0 ,rÊ2a$#ÊÉ°Qˆ gH«Z×ÊÖ¶ºõ­pÕB SPƒÊWÎò–»üå0ym‚ --- NEW FILE --- GIF89aK& dÏïûÿ€‚ƒ„…†‡ˆ‰Š‹ŒŽ{bQt—˜˜x…#|QQ|¦Qª¥¦©{#°#¦³¤¬¨ ¬Q‚Ã|#T# |È¿¦Á´Í¬Æ»¬®´Ÿ¬ŸÑ·R³žµ}«ž£ãÔµ·¹Û¸åQæØâÀö ­‘øtá+“AM¦º jçg•±azžå ¢’½d¸éYÆÿ> H– A%¢ EÊÔc²)Ò5Ó) ÑdÀ>_,ØáÅ@ÂA n¹)wµ¬Ù³hÓª]ËÖP.°jÀ@W9eeàÍÁ¿€ L¸°áÈ+^Ìø҂Ǻò ”¦ÀÍléI…ÿŒ*k“Î1ÙQ«€š«#˜¹É˜žL@¬›L€g³vH?¶Ö>ð ¤­ÙÙ¯ ¬™¶ÚBëcQtŠNF¡c¬µa ÿÜ0˜~ëäc». at AA®­è>¦n+Û.³€ºÙæ®±ÙöZm-×\á«FÖê« äû¯Áá–[ñæBÆo½þJ¼/¹}&rÅ”ÌÑh˜ÿH‘\ˆÿI±¨¢ÛuˆßˆvÈ sS¼ÜâjDà•~r<Ç*ø(‡~8m—óËíÉÌx)ßµÐ8ëLãnD³g Ë:Çú fxÄ+‚ ! ”È6>s™ÉüŒWVÑœh®§˜^Ë2îòM`ÞÒkŠŒCÒ®ÓNs2m䥡ÆÉcB3˜Û‘B&ƒ£ 6Ë8”Ö ;°ˆù `ˆ@£Ê.pÑKcÃÒ˜±êajbÀÙƒÆ"p¯ƒ‘tWõ×>3©Vm‚Zÿ #˜ºRúÑ9´S¹Z©Lv°+1Çaµ)¸.ÐR[Ñt¨cÊž(aÍĜ犄° FŒñ=WHõ#} bG„¸ª¢r¬(Åâ0Ær4àŠÐðêV‡²”qCv4ìHÜFœìA%Xõªê°ºÖÀÉ•Jݸj$ºB¤ª1«º‡«ÖR’6€¨M:+p|¶ žË>SÄ(£&>I‚"ˆ‰aÆRm€èÈ&´Ð¶=0ns«[j$—þìa4¾ƒP‚ø‚0ûX'1lPi#^¤Ó@ð¦)P£!Õ„3Eôyƒàî©Nÿèò,Ý‚# (h@Ô±@hâÂØ@Òvv”Ìzp øð-9YWáúÉ Z ò’ËÞšßÜ(Nl¹ÁÀØÄ€($ 7 "}•ä “M Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15993/images Added Files: Tag: rel_2_0 holder.gif inside-koha-bottom.gif inside-top-join.gif inside-top-member.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a --- NEW FILE --- GIF89aE ¥Ç¤çƒ$¾°8ü-›? ¨Z@ a¬ðÊpñ‚Çø<Ùü­dÕH ! p†B !fx uv|e€S‡žpœwc akŒ!…Ÿ´µC !º»¼½±³¶Â†‚ O~ή€ÕIRŸRHŒ• z{ß ÐÖJrµ u¤áò•™€rÃC°Žê 8`‡ p0Ç€“†ûj1p‚8yáÊ@¢8¥@ÄZýÜ™IRI ‚Å ¡É€ *˜Ç'š½’J€ ÏÓ¶ÿ$~*ÍWá!Î"jýÄPæÐqŒÄ‚§-ªèØÁˆ±’kT í+ ×1ßUËeAÝG !,4-“Ç‘æZ’¤ ±«èœB7O.K²j³ g`Cr9ˆ¡åË ”-Û¼¬†ËÄuü؃ºþ™:Û êA©JËžM›Ö Ÿ€PR˜4% T$!@Ñoý°…€fáQ`ø4@Ø‚ C €³ 7à8 ({óЋŒ4 Ô\ÖŒÃÑP" --- NEW FILE --- GIF89aa2 ö{ÐLâÄŠ$úiÈPeÊ„ M DÉšM@Ò* YÀ³ç‚ÿ 1bcÔ`(€F5h ¨(¢L½hÐâhÔE/dLðɵg#º.0¡ð‰°>5hö€k‰² €ë!»u{’EtV¬OÈ@~áwA®ž)Mø<Ìs¯Ù¹<ï.ÎK—}¹:¹ráÏ C‹KIÚNŸ¬B˜Åº5k 1<ŒžM»¶íÛ¸sëÞÍ»·oÄ’LëN¼¸ñãÈ“+§b!† (¸f„Ây„åسkßΈíaÆM¿Ó«_Ͼ½û÷¿ÿœJ"zP9E Œ?!ƒ< ‰¨Á>ô¤à†aa!RØ"ebhd†Q`Ø…<­Ø`‹/FâˆrCdŠ‘‚€-à“B8P$|êù1Ÿ…a Ã}‹ †U!"6‡ÄÁ!l€š û°6À„q]¶è¦«ÿî¼e «ÙªÈ aXðë½øæ«/¾òÁº‡'îzp•¼°Pn$7%¬ð 7ìð&9 ÇDmåž ‚€Š  À`-8ád0¬œàñ`Š66ò%Fd¥Ÿe¥]OòIXˆ1Êb!†¼H*Y at upf-¥'èNO—ò²¨Žh;õ©@j6¢R«Z„°B(Ô C U ¥4¿G‘“ N€Ú †Q†*Ê#7ƒ¹'ŒæJ‡Ì(ç5Gz4¶E`»€å芗ö —ÿÙ\ÄLz¡VÝœçIO!ädm¡"èÄ¥*Y=¡`k OùÊ[þò --- NEW FILE --- GIF89aa2 N!“ì“' ®|N¯Ûïøü’Äïûÿ€4 åG U’“!f̘ЈÓC/ž"j™È)¢Å`ð …4˜p\z‘ èškßν»w"¹YÍ0W½<"´ù^Ͼ½û÷ðãËo­Ï©$´KØZdÀ@yý怂z²åÄT ¬€@ 9uöÎ1L0 p¶6gg‡¬ö§gL-èÚ;¶&Xž ÚÙYŸrÆ(k1Šä¥óV )¦ÑhÔ(ª,cʀ驨¦ªêªµ窦;iÆäw´Öjë­¸æÊ„P hNÜÕjN\q …±Ö2:7€hgwãX÷j»ùwWŒ¶ƒÅ¯áô7F!Öù¸ßvŒ;HùÆœ¿¶©}ðñu)ƒ¨ÀH=g(ò¥•ãÔ³ ¬O"öôž)áÎÞBÀ3….Ü>ÁŽ@KŽ ˆ' .¶‡M¬ïÒ×Xë]V±œý2+<ÍO˜ J€ˆ From kb2qzv at users.sourceforge.net Sun Feb 22 23:41:27 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:41:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images inside-top-search.gif,NONE,1.1.2.1 koha.gif,NONE,1.1.2.1 menu-home.gif,NONE,1.1.2.1 menu-join.gif,NONE,1.1.2.1 menu-login.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16122/images Added Files: Tag: rel_2_0 inside-top-search.gif koha.gif menu-home.gif menu-join.gif menu-login.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a]2 k°¯ÆǃL~*ìœÌ"ˆœsvbhÊ6áF‰ØÎòè Ò%m·Æ€K+۷榫ÿn·Ô•âÞ»ðÆ+ï¼ô6‚P ï¾dðõ,ðÀomØð@ ¢ÉBÀ „‘^ÁWlñr– ºe«È aø×ìÈ$—lòÉ(§aÑòçžp@ˆ[7r@Ä‘\£óÎ<÷ìóÏ>gsJSF<ñ Ô\6Ô 2‚'؃V„6.˜¬ÊqžÐ0"Db}àÕ^‡ ËÝÜéî™l`C©)]Þ À}p‰0L¢B ˆØÄ*ÒÐ…7Ìa‰HÂ-z ‡$ £ÇHÆ2¢‚hC ~pÅ 9#Òbµï@'ˆ©-¯'¬\+b×í-îFEÉ&­¯Ø§*•,ôk ­rÙ €—£Läâ 4 ê·À‘L8õµ¬îUûš~³þ}ésãÏÕ¸téS€ð€Ûù³€ú'\eejþøÇ?Q%Œ¶?¨ ‚ð§µ3Æ4¹P{˜€ ¸€“Ð@“Åq~pW50s-(  À€¸ØÖ@BuW4òa¹UÚµ6ù—‚*¸‚ BTîôNG --- NEW FILE --- GIF89aÈ pMVAyˆÆðTRYÏä1L'dËeÒÚ@ÿS|"ʲœ§†@¡½$ÑÉ:þYÑcÊÔ… ¯¼“†„ªÕ’_¼f¸ ½I øÍEt¤u‰\@I ML†UÈ)í” “=s½ªËïH ‘ 'î$¦vUDà=åæ%ÖÀ•ÈØv¤Ù› ¾d§¼OËwñ)¸úªšl¿¦DcŠèO…HS`œ '%Ø'=´ø‡HzU˜kF8¦Ïûý´ÿK2ñICk½5ᘉHÜÔÐzˆÀ¦ÅRñ€G#$×Tþ¥"mOœu ¦8„…Ý<_^ª`H³‘Ö…ˆ¨Â5¨2Jô8d‘1ôŒLâbäQ&ÙD‚8iD>ñ%Ò˜'`bùx©i„ü­‰ÉŽL0·Á6,&ÑÌ[“•f›«yᚌÚárg|B“0Ø$l^²©qZÚR“Træ™rãÄh§Î¤ŽPÍjD©‡X™D§‘pÖ"q¶ᘢGàšBˆH$—‚®V,™‚8}ðéL†!¼ÞÉDªæ01²G0§§NØ……¬UDÿlÎRE¶–61Ú¸·ÓD»àQîk]Ј+ùLšEµŸ¸©„³ï—L¬hÙd.1±ïºTH¸¬ ÑȪE»€Þû d"B±÷¹„ÅîŽAÀ­ÁT$Çl!§ÀD”-5r°F0÷å^›Å\'ø5rŸ žj©23Ü~¤ß'êI«S<7ÌQhˆõÉß½§½\à¼rZG2-§ŸÐKÄNà\õçÅ _ᯨ‡6ûIäK´k¸ ›ÝåÛý} Ç&kañæ«^·K³þ+«ã4m;.áÿÏU8ö@Ù˜;±oíJL^¥8÷^s_ ±ïàC¸&4˜ QóÓKøͼÆþŒ„ðž'a,ðFàü¼¡&ï›' • äcwÝ>;ÿ¸¡¼•+© !×îÑH.Er£ƒ†¾'ø" 8»^¢„!õGB+T»“\MgÑ«žÐ8ãM!TCY "EüG.O,®^°S™ !…$&fó+‚ßÀ÷;pŠNð™ê¸Ç¿U ¦@VÐ9zA∻* Âf‘­ÿÈYJ‚ÝQ°Þp:ÇCáHI !ß¾FØ ¥!TyÎJ°)‡‘ÐS{I…áp¾Ð¨ÂW7Ñp¦„Î]ŒV¦ ˆ˜0ˆ“ APd«ß\´½ ~.Ìq“!àØYAC'G‡ &!þ9pxúDV‚E¬C|âf OÜ'WSaÓ’FžÝ¤r”—`¡ †xÊÌyb|‹ò„ƒòñ4‹qOU&ù%DO¸Rlû…à¥7gQïHNd£:u¯%¸æ‰ØFS¢¨ Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16289/images Added Files: Tag: rel_2_0 menu-mysettings.gif menu-search.gif mouseover-home.gif mouseover-join.gif mouseover-member.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89aZ gg $nt"y+Z&€z? ¡¢Ÿl"ns~q›\Z¬ ­€ |\¼p§’aZwV)££#¨€b’Ä#­´µ–axx]×ysÝtoUÊ€º)УÕnÂŽ,<˜r‰: ¨0Ÿ@èTÐäæ˵¤'¡¬"䕨+íP­ò‡Àa‰)€àdkHSD×X‰ ¢yo,0C‘!ÀÈP.˜T×­N® œ¦ Õtf—‡³(úãióg-š.‰Š<* Éa7ûXÚIBÕ\€ZcS¢Ö?ï|dàCˆ((€:Ú@€I7ªízcB „˜¼±¤+[Ä_wy˜ƒ'Ëde*dÀ—O --- NEW FILE --- GIF89aG Rz`¨ÀPI,'VVDCAÍÂ7èÞR# "/ Öb0è@§©\IP%á‡d9äð ŽTƒ#Bƒè 0—ƒje0Ù¦› --- NEW FILE --- GIF89a,0 -,‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š™- +‚''}|~av‚+†,E=B?B=C 1´B:2102²»D½¿1µCò¯?==3ÈË22ÓÏÑÔÖ²ËÍB¯ÓáÌÚDÝäصÅÀå±BÕëÁæ?Öæßä³µËü×ÐÒY69ÔâS QcJ9é¦N¨@ƒXµH±¢Å‹3j$‚¨ ¨PužPؤOÈ“Sª\ɲ¥Ë—0cÊœI³¦Í›8sêÜÉs$‰ÿ@ƒ J´¨Ñ#})Mq`…S§ (˜JµªÕ«X³jÝʵ+×N^ÊK¶¬Ù³h·.xʶ-I&I—2uZ‘j0bÈ€µDÀ"~“2x™ÃMþQœ±xîœ8Ž|´²Žžœt éÛ% ǤŠxÈòE :¨°7µjÖ¦cË&ha˜ÏJú¸TúTjÚßÀƒ N¼¸ñ°k*u‰;É \,˜8I½ºõëسkßν»¨îàËO¾¼ùó€XŽÊãâ„ì÷ðãËŸßÄô>øóëßÏ¿¿ÿÿ ‘¨Læ©Ã:j4…2)ç5y9YKœlòˆ„/²$£¡¡Ê¥ ¡¤^À* ÄŠg,ðÀN =äÈ+-Eÿ—Dç®ûî¼÷î{$ÿ÷èqÉÕ!8r­üòaöTÉOãÂüéo5ØóÕ— Ø;LÀþøI¡K” úW„ÿñ¯{8`8È üMã~ÄÐr@^ñ*5°` 3˜š ¯3Ò#©JW›Ejtbmþb©LgZ“­‡*±ÝFÇÓžúô§@uDðæ?ù½ÍuHMªR—ºÔ ýÁCÍô"¤ÏYõªXͪVCBU;HOL «XÇJÖ¦Jï)«Z×ÊÖ¶âÍk£KÓÙæJ׺Úõ®H{M÷ÊW --- NEW FILE --- GIF89a,0 5u¬µ¶-e— W Bž.\>U^` d¦$˯³¯´ÓÒÖ ©ÙåÛìê¨ÚÔïÝËÞ ØD´ !‚ JÃ\Ð-’ýI¦XQ„?W¢ ÂË7" !‡6­»áêÚ–‹g†þ¯7×™GÞ0yÓV1}U"ŠT²Y$ºio±^UÔ Äoou}Ùòë§x¯×]¼TDx)ð  ˆÑ H c]ØÎ…a¹Â¡ˆíˆu†î¤Q£†ºòb‹a䢌0b…bí怑1zán —ÀL¦2—ÉÌf:ó™ÐŒ¦4§IÍjZóšØ̦6¡©•I­ŠÔ•8ÇIÎršóœ>¹SͦÈÿý¯Z£Ø¦<çIÏzÚóžøÌg3S©Òù± €„ AˆÊA‰€ ¨€€AÄÿ£Šh(0*Qˆ‚Ô¢(ýOwÖôÊ€þE™b¸¶2f9n½î:Ö“ŸàG½áÅàCžñʾÊlOxÿZžû²Gõ…Ï|#PUñöEø]o|уžO{7=æQc>-*r>¾ùýô¦ÝCLôÎúºáIõ_NÅVšÁdÅ¥KMV79h¨õg²IU'2.iœ#DÜøˆÙDUÁ&–"B3¬9Þp=F6‰-È2+ÛX†¼9l3›Èç°1ƒ,FØ(„#Yj3+ZËT£g/»DþV¼v!ræ1Aê06äh#²´ùMeªÓ@à478UÎq¤A¶ù&nÿE,Žå:›ÀØ($¹¶™nutÛè(º‘ÙVtš»Üä€wcòx¡v#Cà˜÷éè®áœ¸‹^H±W9;(Ϩjš†¹îºò’Ä0»Þ„)Á"SkjôàÊ@ÍÁ@Ú7\7 õƒI¦Ò‚Av6Ë„©¼ãµŽ„¯ó0+xcÉy°?¬a ÿFÆ– e²d?Ž¥2#(ã>‘ÌÁ$Ô.@,&û#$­Í`ŒN^rT¸£&+â5':ca¤Ìå.GòÇÍú‚Pð SyË®£Î Ä« 㩠ΙˆJ€„LÄO8 N܃‚3!¿ùÖQŠçÁßûBx;œqñ„\€_Û×n6 ¶CåW£Ñº\^ðÆü¤) zXðäVúv31¨>q™éÀmrtu¸æÓ£T,}›¸ºÖíÉOýAîèHg :g¥%¥”&Ä»Q --- NEW FILE --- GIF89a,0 g 59á2âåæäæé.Ì ÑBX\ÖEZdh"èÐA tð@Â@/: ¢àÓG1p(ˆ9 ¨‚Š%˜h_ˆ=Y•;…„*ð`el6Û?’dkn ¹ÚF&©$i:£ Ñ‱3±7 ò,DË‚³•ÿ´~„ŽCÖ-± TW-?Û’eì@AÍí¹èiÕ­¸Æ²›Þ,¼Wí±â~nuX1‹^¾¤{¸ÄúD¯½þ>+‚¼OÝë¢ f¡×ZlíÚÂ¥¹  ~ý/߀Ÿzþ0‰¶ïYïyÃö?°A~õ³ OHÀpÑï ”HB¨ ÊA9lè`uR²µúñxäÛàIÈBòˆL¤"IÈ;ò‘Œ¤$'II@  L0( 0&%q̤4P#A2àx¨À„k­ ”Ï:€7l%i?o·ÈÂ2h†KÀ UÑ From kb2qzv at users.sourceforge.net Sun Feb 22 23:42:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:42:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images mouseover-search.gif,NONE,1.1.2.1 search-button.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16393/images Added Files: Tag: rel_2_0 mouseover-search.gif search-button.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a,0 XB^]_AV 9óó4X0úôýþÿ24X€à †;ð0 |áµÙD×[#§ÀHðà)nH ꨨÆj©¶ŠÛ»•zª§0 Ž`€ 6) yñàC_À+ì°Äkì±È&«ì²Ì6ëì³ÐF«Ù_XhAÀÿ ¨ì*qµp«a»žP£(xA”£Qæ’Ò`ž-Åh<J˜5Òd$hŠi¡Ëc$WM½„” àZ †«ˆãÙ/]°ª'Å Õºn¸]d'AšM¨´£¸ÅB(ïÐè¦_A½9mjƒÊS”F7 =©ÞÔð=T]*üâ3øÆO~ñŸ*SæKµ›U³pÿP‘ZÿúÕ(ö·Ïýî{?¤}¹*;\+ ˜J¬fiø€¸-! --- NEW FILE --- GIF89a£ † ‘¥¨¶¯©$¸ ›"  ˆ†4ÌÍXLÕÖ×ØÙÕ 9ÐÍà óòl-Ìp2'Âë œéÓ¨S«^ͺµë×°cÇÞWZ ÂæhèÞÍ»·ïßÀƒ N¼¸ñãÈi0biq²£KŸN½zuÚÏ Õ@ De‚ $ Ò$ FÒ ±ökeœ‘+Ù;f¡cµÎ¾}÷³åEù·¤JZ{€ýl®¿~µìí§0c%ïCˆù y!•ŽTñ€ý·™0s¹ ‹3½P‡#P¢*4(‚”¡‰"°Ü©Ø ò0f£Ú°¶¶Ä¤œá@âW¿8ƒ¤BÖéNE²`급HàOQŽê˜C¬)uÄÊf~·°5¯j§˜‚ E’°Àk$I From acli at users.sourceforge.net Mon Feb 23 02:21:06 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 17:21:06 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.22,1.23 tmpl_process3.pl,1.5,1.6 xgettext.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13082 Modified Files: TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Fold all consecutive whitespaces into single blanks. This avoids problems when minor whitespace changes occur in the original templates; it also makes the strings much easier to read (e.g., instead of "foo\n\n\t\t bar", xgettext.pl will now always generate "foo bar" and tmpl_process3.pl will understand it to be the same as the original string). Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** TmplTokenizer.pm 22 Feb 2004 21:34:40 -0000 1.22 --- TmplTokenizer.pm 23 Feb 2004 01:21:03 -0000 1.23 *************** *** 449,455 **** --- 449,471 ---- } + sub string_canon ($) { + my($s) = @_; + if (1) { # FIXME + # Fold all whitespace into single blanks + $s =~ s/\s+/ /gs; + } + return $s; + } + + sub _formalize_string_cformat ($) { + my($s) = @_; + return _quote_cformat string_canon $s; + } + sub _formalize ($) { my($t) = @_; return $t->type == TmplTokenType::DIRECTIVE? '%s': + $t->type == TmplTokenType::TEXT? + _formalize_string_cformat($t->string): $t->type == TmplTokenType::TAG? ($t->string =~ /^': _quote_cformat($t->string)): *************** *** 599,602 **** --- 615,622 ---- } } + if (defined $it && $it->type == TmplTokenType::TEXT) { + my $form = string_canon $it->string; + $it->set_form( $form ); + } return $it; } Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** tmpl_process3.pl 22 Feb 2004 21:34:40 -0000 1.5 --- tmpl_process3.pl 23 Feb 2004 01:21:03 -0000 1.6 *************** *** 33,38 **** sub find_translation ($) { my($s) = @_; ! my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; ! $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); return defined $href->{$key} && !$href->{$key}->fuzzy --- 33,44 ---- sub find_translation ($) { my($s) = @_; ! my $key = $s; ! if ($s =~ /\S/s) { ! print STDERR "DEBUG: before: ($key)\n"; ! $key = TmplTokenizer::string_canon($key); ! $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); ! $key = TmplTokenizer::quote_po($key); ! print STDERR "DEBUG: after: ($key)\n"; ! } return defined $href->{$key} && !$href->{$key}->fuzzy *************** *** 313,329 **** file as c-format strings with %s. =head1 BUGS The --help option has not been implemented yet. - If an extracted string contain actual text (versus tags or - TMPL_VAR directives), the strings are extracted verbatim, - resulting in unwieldy things like multiple spaces, tabs, - and/or newlines which are semantically indistinguishable - from single blanks. If the template writer changes the - spacing just a little bit, the new formatting would be - considered new strings. This is arguably wrong, and in any - case counter-productive. - xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. --- 319,331 ---- file as c-format strings with %s. + Whitespace in extracted strings are folded to single blanks, in + order to prevent new strings from appearing when minor changes in + the original templates occur, and to prevent overly difficult to + read strings in the PO file. + =head1 BUGS The --help option has not been implemented yet. xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** xgettext.pl 22 Feb 2004 21:34:40 -0000 1.4 --- xgettext.pl 23 Feb 2004 01:21:03 -0000 1.5 *************** *** 56,61 **** # If we determine that the string is negligible, don't bother to remember unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; } } --- 56,62 ---- # If we determine that the string is negligible, don't bother to remember unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! my $key = TmplTokenizer::string_canon( $string ); ! $text{$key} = [] unless defined $text{$key}; ! push @{$text{$key}}, $token; } } *************** *** 154,157 **** --- 155,159 ---- printf OUTPUT "#, c-format\n" if $cformat_p; printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po + TmplTokenizer::string_canon TmplTokenizer::charset_convert $t, $charset_in, $charset_out; printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? From acli at users.sourceforge.net Mon Feb 23 04:13:38 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:13:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport marcimportdetail.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31496 Modified Files: marcimportdetail.tmpl Log Message: "maxlenght" should be "maxlength" Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** marcimportdetail.tmpl 11 Feb 2004 09:02:56 -0000 1.4 --- marcimportdetail.tmpl 23 Feb 2004 03:13:35 -0000 1.5 *************** *** 12,39 ****
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Title" size=40 maxlenght=255>
    Subtitle" size=40 maxlenght=255>
    Author" size=40 maxlenght=255>
    Additional authors
    Illustrator" size=40 maxlenght=255>
    Copyright" size=20 maxlenght=80>
    Series Title" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Number" size=40 maxlenght=255>
    Volume Date" size=40 maxlenght=255>
    Volume Description" size=40 maxlenght=255>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    LCCN" size=40 maxlenght=40>
    Dewey" size=8 maxlenght=10>
    Subclass" size=40 maxlenght=40>
    Publication Year" size=5 maxlenght=10>
    Publisher" size=40 maxlenght=255>
    Place" size=40 maxlenght=255>
    Pages" size=5 maxlenght=10>
    Size" size=40 maxlenght=40>
    --- 12,39 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Title" size=40 maxlength=255>
    Subtitle" size=40 maxlength=255>
    Author" size=40 maxlength=255>
    Additional authors
    Illustrator" size=40 maxlength=255>
    Copyright" size=20 maxlength=80>
    Series Title" size=40 maxlength=255>
    Volume" size=40 maxlength=255>
    Number" size=40 maxlength=255>
    Volume Date" size=40 maxlength=255>
    Volume Description" size=40 maxlength=255>
    Subject" size=40 maxlength=255>
    Notes" size=40 maxlength=255>
    Item type
    ISBN" size=40 maxlength=40>
    ISSN" size=40 maxlength=40>
    LCCN" size=40 maxlength=40>
    Dewey" size=8 maxlength=10>
    Subclass" size=40 maxlength=40>
    Publication Year" size=5 maxlength=10>
    Publisher" size=40 maxlength=255>
    Place" size=40 maxlength=255>
    Pages" size=5 maxlength=10>
    Size" size=40 maxlength=40>
    From acli at users.sourceforge.net Mon Feb 23 04:15:04 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:15:04 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31759 Modified Files: intranet.zh_TW Log Message: Interim update Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** intranet.zh_TW 22 Feb 2004 06:46:16 -0000 1.5 --- intranet.zh_TW 23 Feb 2004 03:15:01 -0000 1.6 *************** *** 4,8 **** # Copyright 2004 Ambrose Li # ! # FIXME words tentatively translated: active, illustration, illustrator, inactive # FIXME "request", "reserve" should be é ç´„ [http://www.tpml.edu.tw/chinese/service/service.htm] # --- 4,9 ---- # Copyright 2004 Ambrose Li # ! # FIXME words tentatively translated: active, illustration, illustrator, inactive, order, receive, seen ! # FIXME tentative: bookfund: 書ç±è³¼ç½®è³‡é‡‘ [...4274 lines suppressed...] msgid "traducteur" --- 6881,6884 ---- *************** *** 7096,7110 **** msgstr "z3950查詢" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 - msgid "" - "|| \n" - "Help" - msgstr "" - --- 6901,6902 ---- From acli at users.sourceforge.net Mon Feb 23 04:18:32 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:18:32 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-moredetail.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv619 Modified Files: opac-moredetail.tmpl Log Message: Comment syntax correction Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-moredetail.tmpl 22 Dec 2003 09:14:21 -0000 1.8 --- opac-moredetail.tmpl 23 Feb 2004 03:18:29 -0000 1.9 *************** *** 14,18 **** > > ! --- 14,18 ---- > > !
    From acli at users.sourceforge.net Mon Feb 23 05:00:40 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:00:40 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac.zh_TW,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8691 Modified Files: opac.zh_TW Log Message: More interim updates Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac.zh_TW 20 Feb 2004 07:25:38 -0000 1.3 --- opac.zh_TW 23 Feb 2004 04:00:38 -0000 1.4 *************** *** 15,27 **** "Content-Transfer-Encoding: 8bit\n" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:10 - #, c-format - msgid "" - "%s\n" - "(%s)" - msgstr "" - "%s\n" - "(%s)" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:11 #, c-format --- 15,18 ---- *************** *** 47,51 **** #, c-format msgid "%s acquired in the last %s days" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:15 --- 38,42 ---- #, c-format msgid "%s acquired in the last %s days" ! msgstr "最近%2$s日內新到的%1$s圖書資料" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:15 *************** *** 57,61 **** #, c-format msgid "%s, %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 --- 48,52 ---- #, c-format msgid "%s, %s" ! msgstr "%s, %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 *************** *** 63,93 **** msgstr "©" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:28 - msgid "," - msgstr "" - - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:89 - msgid "-" - msgstr "" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:20 #, c-format msgid "%s GROUP - %s " ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:56 #, c-format ! msgid "" ! "BARCODE\n" ! "%s" ! msgstr "" ! "æ¢ç¢¼\n" ! "%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 #, c-format ! msgid "%s ( record %s )" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:24 --- 54,81 ---- msgstr "©" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:20 #, c-format msgid "%s GROUP - %s " ! msgstr "%s 群組 - %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:56 #, c-format ! msgid "BARCODE %s" ! msgstr "æ¢ç¢¼ %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 #, c-format ! msgid "%s ( record %s )" ! msgstr "%s (書目記錄號碼 %s)" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:83 ! #, c-format ! msgid " Accession Date:%s" ! msgstr "登錄日期：%s" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:87 ! #, c-format ! msgid "Total Issues: %s" ! msgstr "借書次數： %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:24 *************** *** 96,99 **** --- 84,92 ---- msgstr "附加著者：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:23 + #, c-format + msgid "Author: %s" + msgstr "著者：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:91 #, c-format *************** *** 109,133 **** #, c-format msgid "Cancelled: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:36 #, c-format msgid "Classification: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:35 #, c-format msgid "Classification: %s%s%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:29 #, c-format msgid "Collection: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:77 #, c-format msgid "Current Branch: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:39 --- 102,126 ---- #, c-format msgid "Cancelled: %s" ! msgstr "已註消：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:36 #, c-format msgid "Classification: %s" ! msgstr "分類：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:35 #, c-format msgid "Classification: %s%s%s" ! msgstr "分類：%s%s%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:29 #, c-format msgid "Collection: %s" ! msgstr "館è—：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:77 #, c-format msgid "Current Branch: %s" ! msgstr "ç›®å‰é¤¨åˆ¥ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:39 *************** *** 136,148 **** msgstr "日期：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:90 #, c-format msgid "Group Number: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:71 #, c-format msgid "Home Branch: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:36 --- 129,147 ---- msgstr "日期：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:35 + #, c-format + msgid "Dewey: %s" + msgstr "æœå¨åˆ†é¡žè™Ÿï¼š%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:90 #, c-format msgid "Group Number: %s" ! msgstr "群組號碼：%s" + # XXX tentative #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:71 #, c-format msgid "Home Branch: %s" ! msgstr "您的分館：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:36 *************** *** 151,154 **** --- 150,158 ---- msgstr "國際標準書號：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:21 + #, c-format + msgid "ISBN:%s" + msgstr "國際標準書號：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 #, c-format *************** *** 169,173 **** #, c-format msgid "LCCN: %s" ! msgstr "LCCN: %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 --- 173,177 ---- #, c-format msgid "LCCN: %s" ! msgstr "LCCN：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 *************** *** 189,198 **** #, c-format msgid "Last seen: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:33 #, c-format msgid "Loan Length: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:45 --- 193,202 ---- #, c-format msgid "Last seen: %s" ! msgstr "最近出ç¾ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:33 #, c-format msgid "Loan Length: %s" ! msgstr "借閱期é™ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:45 *************** *** 221,240 **** #, c-format msgid "Place: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:25 ! #, fuzzy, c-format msgid "Published by :%s" ! msgstr "出版：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:37 #, c-format msgid "Publisher: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:82 #, c-format msgid "Renewals: %s" ! msgstr "續借：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:34 --- 225,244 ---- #, c-format msgid "Place: %s" ! msgstr "出版地：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:25 ! #, c-format msgid "Published by :%s" ! msgstr "出版者：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:37 #, c-format msgid "Publisher: %s" ! msgstr "出版者：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:82 #, c-format msgid "Renewals: %s" ! msgstr "續借次數：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:34 *************** *** 251,260 **** #, c-format msgid "Serial:%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:43 #, c-format msgid "Size: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:30 --- 255,264 ---- #, c-format msgid "Serial:%s" ! msgstr "期刊：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:43 #, c-format msgid "Size: %s" ! msgstr "大å°ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:30 *************** *** 278,281 **** --- 282,290 ---- msgstr "網å€ï¼š%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:38 + #, c-format + msgid "URL: %s" + msgstr "網å€ï¼š%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:33 #, c-format *************** *** 286,290 **** #, c-format msgid "Volume: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:31 --- 295,299 ---- #, c-format msgid "Volume: %s" ! msgstr "集å¢è™Ÿï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:31 *************** *** 296,300 **** #, c-format msgid "You have a credit of %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:28 --- 305,309 ---- #, c-format msgid "You have a credit of %s" ! msgstr "您有 %s çµé¤˜" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:28 *************** *** 310,313 **** --- 319,327 ---- msgstr "　於%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:9 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:4 #, c-format *************** *** 323,331 **** msgstr "紀錄正確嗎？" - # NOTE: see http://webpac.lib.ncku.edu.tw/Webpac2/store.dll/?ID=391066&T=2 - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:84 - msgid "Accession" - msgstr "登錄" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:90 msgid "Advanced Search, More Options" --- 337,340 ---- *************** *** 358,365 **** msgstr "著者" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:23 - msgid "Author:" - msgstr "著者:" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:67 msgid "Available" --- 367,370 ---- *************** *** 394,398 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:41 msgid "Class" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:59 --- 399,403 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:41 msgid "Class" ! msgstr "類別" #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:59 *************** *** 406,414 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:29 msgid "Copies" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 msgid "Current Loan" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:49 --- 411,420 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:29 msgid "Copies" ! msgstr "數é‡" + # FIXME variable name is "status", but... #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 msgid "Current Loan" ! msgstr "ç›®å‰ç‹€æ…‹" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:49 *************** *** 416,424 **** msgstr "到期日" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:85 - #, c-format - msgid "Date:%s" - msgstr "日期：%s" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:51 #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:66 --- 422,425 ---- *************** *** 431,438 **** msgstr "å二月" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:35 - msgid "Dewey:" - msgstr "æœå¨ï¼š" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:95 msgid "Due date" --- 432,435 ---- *************** *** 441,449 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:5 msgid "Easy / Picture Books" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:6 msgid "Easy Reader" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:34 --- 438,446 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:5 msgid "Easy / Picture Books" ! msgstr "淺易/圖畫書" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:6 msgid "Easy Reader" ! msgstr "淺易讀本" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:34 *************** *** 485,492 **** msgstr "ä½å®…電話" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:21 - msgid "ISBN:" - msgstr "國際標準書號：" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" --- 482,485 ---- *************** *** 495,499 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 msgid "Item Count" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:47 --- 488,492 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 msgid "Item Count" ! msgstr "數é‡" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:47 *************** *** 501,509 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:94 msgid "Item Type" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:96 msgid "Itemtype" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 494,502 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:94 msgid "Item Type" ! msgstr "圖書資料類別" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:96 msgid "Itemtype" ! msgstr "圖書資料類別" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 518,522 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:28 msgid "Join the library" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 511,515 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:28 msgid "Join the library" ! msgstr "辦ç†è®€è€…登記手續" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 532,540 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:8 msgid "Junior Fiction" ! msgstr "å…’ç«¥å°èªª" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:7 msgid "Junior Non-Fiction" ! msgstr "å…’ç«¥éžå°èªª" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:20 --- 525,533 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:8 msgid "Junior Fiction" ! msgstr "å…’ç«¥å°èªªé¡ž" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:7 msgid "Junior Non-Fiction" ! msgstr "å…’ç«¥éžå°èªªé¡ž" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:20 *************** *** 548,552 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:8 msgid "Keywords" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:32 --- 541,545 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:8 msgid "Keywords" ! msgstr "é—œéµå­—" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:32 *************** *** 556,560 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:50 msgid "Last Seen" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:10 --- 549,553 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:50 msgid "Last Seen" ! msgstr "最近出ç¾" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:10 *************** *** 580,591 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 - msgid "Log Out" - msgstr "登出" - - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 - #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 #, c-format ! msgid "Logged in as: %s [" ! msgstr "ç›®å‰èº«ä»½ï¼š%s [" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 573,579 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 #, c-format ! msgid "Logged in as: %s [Members Home][Log Out]" ! msgstr "ç›®å‰èº«ä»½ï¼š%s ã€å€‹äººä¸»é ã€‘ã€ç™»å‡ºã€‘" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 599,607 **** msgstr "五月" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 - #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 - msgid "Members Home" - msgstr "讀者主é " - #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:70 --- 587,590 ---- *************** *** 629,633 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:27 msgid "Normal" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:89 --- 612,616 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:27 msgid "Normal" ! msgstr "一般" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:89 *************** *** 684,688 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:74 msgid "Pick Up Branch" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:107 --- 667,671 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:74 msgid "Pick Up Branch" ! msgstr "å–書處" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:107 *************** *** 692,707 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:3 msgid "Please change what's needed. An email will be sent to the library." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:85 msgid "Please confirm that you wish to request an item of these types:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:44 #, c-format ! msgid "" ! "Please select the branch from which you want to collect the item:\n" ! "\t\t%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:20 --- 675,689 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:3 msgid "Please change what's needed. An email will be sent to the library." ! msgstr "請按需è¦æ›´æ–°ï¼Œé–£ä¸‹æ‰€ä½œä¹‹ä¿®æ”¹å°‡ä»¥é›»éƒµæ–¹å¼å¯„至圖書館。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:85 msgid "Please confirm that you wish to request an item of these types:" ! msgstr "請確定您è¦é ç´„下列種類的圖書資料：" + # XXX tentative #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:44 #, c-format ! msgid "Please select the branch from which you want to collect the item: %s" ! msgstr "請指定您希望在哪間圖書館å–書《%s》" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:20 *************** *** 710,713 **** --- 692,696 ---- "matches one of these types that becomes available will be set kept for you." msgstr "" + "請您é¸æ“‡æœ‰é‚£å¹¾é¡žçš„圖書資料é©åˆæ‚¨ã€‚一有åŒé¡žçš„圖書資料å¯å€Ÿï¼Œè©²é …圖書資料會隨å³é ç•™çµ¦æ‚¨ã€‚" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:21 *************** *** 737,755 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:122 msgid "Reserve date" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:49 msgid "Reserve on this date:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:18 #, c-format msgid "Reserve page for item: %s (%s %s)" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/subject.tmpl:15 #, c-format msgid "Results %s through %s of %s records." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:122 --- 720,738 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:122 msgid "Reserve date" ! msgstr "é ç´„日期" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:49 msgid "Reserve on this date:" ! msgstr "é ç´„在這一日終止：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:18 #, c-format msgid "Reserve page for item: %s (%s %s)" ! msgstr "圖書資料《%s (%s %s)》之é ç´„é " #: ../../koha-tmpl/opac-tmpl/default/en/subject.tmpl:15 #, c-format msgid "Results %s through %s of %s records." ! msgstr "å…±%3$sç­†çµæžœä¸­çš„第%1$s至%2$sé …çµæžœ" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:122 *************** *** 778,782 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:16 msgid "Something new ?" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:4 --- 761,765 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:16 msgid "Something new ?" ! msgstr "有沒有è¦æ›´æ–°çš„？" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:4 *************** *** 824,828 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:9 msgid "Teacher Reference" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:19 --- 807,811 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:9 msgid "Teacher Reference" ! msgstr "教師åƒè€ƒæ›¸" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:19 *************** *** 840,849 **** msgstr "書å" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 - msgid "" - "Total\n" - "Issues:" - msgstr "借書總次數：" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 msgid "Total Due" --- 823,826 ---- *************** *** 851,864 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! msgid "Try another" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:87 msgid "Type in the box and press the enter key." ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:38 ! msgid "URL:" ! msgstr "網å€ï¼š" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:17 --- 828,838 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! #, c-format ! msgid "Try another search" ! msgstr "請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:87 msgid "Type in the box and press the enter key." ! msgstr "在空格輸入後，å†æŒ‰å›žè»Šéµå³å¯ã€‚" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:17 *************** *** 868,872 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:57 msgid "View Accounts" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:5 --- 842,846 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:57 msgid "View Accounts" ! msgstr "查看帳戶" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:5 *************** *** 881,885 **** #, c-format msgid "Which is to be picked up from %s." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:31 --- 855,859 ---- #, c-format msgid "Which is to be picked up from %s." ! msgstr "上列圖書資料之å–書處為%s。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:31 *************** *** 930,942 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:66 msgid "You have reserved items waiting:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:13 msgid "You must select a branch for pickup!" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:12 msgid "You must select at least one item type!" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:6 --- 904,916 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:66 msgid "You have reserved items waiting:" ! msgstr "您有é ç´„了的圖書資料å¯ä»¥å–書：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:13 msgid "You must select a branch for pickup!" ! msgstr "您一定è¦æ’°æ“‡åœ¨å“ªé–“分館å–書ï¼" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:12 msgid "You must select at least one item type!" ! msgstr "您一定è¦æ’°æ“‡è‡³å°‘一種圖書資料的類別ï¼" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:6 *************** *** 951,965 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 msgid "Your changes won't appear until the library has validated them." ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 ! msgid "]" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 ! msgid "][" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:105 --- 925,929 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 msgid "Your changes won't appear until the library has validated them." ! msgstr "圖書館核實您的作的修改後，修改æ‰æœƒç”Ÿæ•ˆã€‚" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:105 *************** *** 983,991 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:74 msgid "on issue bit" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! msgid "search" ! msgstr "查詢" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 --- 947,951 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:74 msgid "on issue bit" ! msgstr "借出" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 *************** *** 996,1003 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:46 msgid "to Koha" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc:8 ! msgid "||" ! msgstr "" --- 956,959 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:46 msgid "to Koha" ! msgstr "Koha" From acli at users.sourceforge.net Mon Feb 23 05:02:09 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:02:09 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8860 Modified Files: tmpl_process3.pl Log Message: Oops, forgot to take out some debugging print statements Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** tmpl_process3.pl 23 Feb 2004 01:21:03 -0000 1.6 --- tmpl_process3.pl 23 Feb 2004 04:02:06 -0000 1.7 *************** *** 35,43 **** my $key = $s; if ($s =~ /\S/s) { - print STDERR "DEBUG: before: ($key)\n"; $key = TmplTokenizer::string_canon($key); $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); $key = TmplTokenizer::quote_po($key); - print STDERR "DEBUG: after: ($key)\n"; } return defined $href->{$key} --- 35,41 ---- From acli at users.sourceforge.net Mon Feb 23 05:18:53 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:18:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en intranet-main.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11946 Modified Files: intranet-main.tmpl Log Message: Missing charset declarations. Needed for translations generated by the translation tools. Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** intranet-main.tmpl 9 Dec 2003 10:28:57 -0000 1.11 --- intranet-main.tmpl 23 Feb 2004 04:18:51 -0000 1.12 *************** *** 3,6 **** --- 3,7 ---- WELCOME TO THE KOHA INTRANET +
    /images/background-mem.gif">
    ">//images/fileopen.png"> //images/edittrash.png"> ">Normal ')">åˆ—å° æ©Ÿè®€æ ¼å¼æ›¸ç›®ï¼š
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    圖書資料
    		class="button">é ç´„
    --- NEW FILE ---

    館è—查詢

    æ¢ç¢¼ 　　或
     
    說明
    查詢：使用愈多欄ä½æŸ¥è©¢ï¼ŒæŸ¥è©¢å°±æ„ˆæ…¢ã€‚
    é—œéµå­—
    é¡Œå Normal Exact
    著者
    繪圖
    æœå¨åˆ†é¡žè™Ÿ
    類別
    或
    主題
    虛擬書架

    --- NEW FILE --- 查詢çµæžœ
    é¡Œå著者æœå¨åˆ†é¡žè™Ÿ
    &startfrom=>上一筆 &startfrom=>下一筆

    共筆記錄中的第至項。
    --- NEW FILE --- ()

    書目記錄

    副題：
    著者：
    附加著者：
    集å¢é¡Œå：
    主題：
    版權：
    備註：
    劃一題å：
    期刊：
    圖書資料總數：

    圖書資料類別 類別 館è—地 到期日 最近出ç¾
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    --- NEW FILE ---
    >é ç´„
    ()

    書目記錄

    " class="button">機讀格å¼

    國際標準書號：">
    副題：
    著者：">
    附加著者：
    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    期刊：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    圖書資料總數：

    圖書資料類別 館è—地 到期日 æœ€è¿‘å‡ºç¾ æ¢ç¢¼ Volume
    &item=&bib=&bi="> &item=>改正圖書資資類別
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    連çµè‡³ 相關網站
    é¡Œå：
    說明：
    網å€ï¼š">http://
    --> --- NEW FILE ---
    書目記錄



    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    ISBN：
    ,
    --- NEW FILE ---


    >é ç´„

    &type=intra> ()

    > >
    /images/background-mem.gif" > 群組 -
    //images/fileopen.png"> //images/edittrash.png">
    書目記錄號碼：
    圖書資料類別：
    網å€ï¼š
    借閱期é™ï¼š
    借書費用：
    分類：
    ISBN：
    出版者：
    出版地：
    日期：
    集å¢è™Ÿï¼š
    é æ•¸ï¼š
    繪圖：
    大å°ï¼š
    備註：
    數é‡ï¼š
    /images/holder.gif" width=16 height=300 align=left>
    /images/background-mem.gif">æ¢ç¢¼
    > > > //images/fileopen.png"> //images/edittrash.png">
    所屬分館：
    最近見éŽï¼š
    上次借出日期：
    上次借書讀者1：
    上次借書讀者2：
    ç›®å‰é¤¨åˆ¥ï¼š
    書價：
    圖書資料已éºå¤±ï¼š
    Paid for:
    備註：
    續借：
    &biblio=&invoice=&catview=yes">登錄日期：
    å·²å–消：
    &bi=&itm=>總借出：
    群組號碼：
    書目記錄號碼：

    --- NEW FILE ---
    您的查詢是按 您沒有指定查詢æ¢ä»¶
    找到 ç­†çµæžœ

    &=&type=opacintra>/images/numbers/prev.gif border=0> /images/numbers/placeholder.gif border=0> /images/numbers/-highlight.gif> &=&type=opacintra>/images/numbers/.gif border=0> &=&type=opacintra>/images/numbers/next.gif border=0> /images/numbers/placeholder.gif border=0>

    bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    é¡Œå著者©æ•¸é‡é¤¨è—地  
    ?type=opacintra&bib=> &type=opacintra> >é ç´„
    bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif">
    &=&type=opacintra">上一筆   &=&type=opacintra">下一筆  

    共筆記錄中的第至項。

    請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ 請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ --- NEW FILE ---
    主題
    ">上一筆 ">下一筆

    共筆記錄中的第至項。
    From acli at users.sourceforge.net Tue Feb 24 06:12:53 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 21:12:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.7,1.8 aqbookfund.tmpl,1.4,1.5 aqbudget.tmpl,1.3,1.4 authorised_values.tmpl,1.2,1.3 branches.tmpl,1.8,1.9 categorie.tmpl,NONE,1.1 categoryitem.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,1.3,1.4 itemtypes.tmpl,1.4,1.5 koha2marclinks.tmpl,1.4,1.5 marc_subfields_structure.tmpl,1.5,1.6 marctagstructure.tmpl,1.5,1.6 printers.tmpl,1.2,1.3 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,1.6,1.7 thesaurus.tmpl,1.2,1.3 z3950servers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18933/intranet-tmpl/default/zh-TW/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: New templates generated from opac.zh_TW and intranet.zh_TW --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明  
    登記有效期
    年齡上é™
    必須填寫年齡
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
     
    資料已寫入
    method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥ 是å¦
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    This record is used times. Deletion not possible
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記有效期 登記手續費 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    是 å¦ /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明 >  
    登記有效期 >
    å¹´é½¡ä¸Šé™ >
    必須填寫年齡 >
    罰款類別 >
    Bulk >
    登記手續費 >
    è¦ç™¼éŽæœŸé€šçŸ¥ >
    é™å€Ÿæ•¸é‡ >
    é ç´„手續費 >
     
    資料已寫入 method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    Bulk
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    This record is used times. Deletion not possible
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 Bulk 費用 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    修改 移除


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    測試 çµæžœ
    圖書資料號碼
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    å¥½ï¼ itemnum : the field itemnumber is mapped to a field in tab -1
    åœ–æ›¸è³‡æ–™ç›¸é—œæ¬„ä½ åœ–æ›¸è³‡æ–™çš„æ‰€æœ‰æ¬„ä½éƒ½å¿…須：
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    å¥½ï¼ All item fields are in the same tag and in item tab
    itemtypes table 是空白的 itemtypes table是空白的，它必須有至少一個值
    å¥½ï¼ itemtypes table 有至少一個值
    itemtype NOT mapped biblioitems.itemtype欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為itemtype
    		•
    å¥½ï¼ biblioitems.itemtype 已設定
    branch table 是空白的 branch table是空白的，它必須至少有一個值ï¼
    å¥½ï¼ branch table 有至少一個值
    homebranch 沒有éˆçµ items.homebranch欄必須
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ homebranch 已設定
    holdingbranch 沒有éˆçµ items.holdingbranch欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ holdingbranch 已設定
    書目åŠæ›¸ç›®è¨˜éŒ„號碼 biblio.biblionumber åŠ biblioitems.biblioitemnumber 欄ä½å¿…須：
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    å¥½ï¼ biblionumber åŠ biblioitemnumber å·²éˆçµå¦¥ç•¶
    總計 您的機讀格å¼è¨­å®šæœ‰å€‹éŒ¯èª¤ã€‚使用Kohaå‰è«‹å…ˆè¦æ”¹æ­£å®ƒå€‘。
      Configuration OK, you don't have errors in your MARC parameters table
    --- NEW FILE ---

    修改字眼

    新增字眼

    字眼
    字眼
    資料已寫入
    字眼
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Stop word 管ç†

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    您查詢
    字眼
    移除
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    --- NEW FILE ---

    修改Z39.50伺æœå™¨

    新增Z39.50伺æœå™¨

    Z39.50伺æœå™¨
    Z39.50伺æœå™¨
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨ (查詢時é è¨­ç‚ºä½¿ç”¨)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    資料已寫入
    >
    å稱
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨
    Rank
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Z39.50伺æœå™¨ç®¡ç†

    >
    您查詢
    å稱 主機å稱 埠 資料庫 使用者ID 密碼 é è¨­ä½¿ç”¨ Rank Syntax
    //images/fileopen.png" alt="修改" title="修改" border=0> //images/edittrash.png" alt="移除" title="移除" border=0>
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    From acli at users.sourceforge.net Tue Feb 24 07:07:07 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 22:07:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue MARCdetail.tmpl,NONE,1.1.2.1 catalogue-home.tmpl,NONE,1.1.2.1 cmsdsearchresults.tmpl,NONE,1.1.2.1 detail-opac.tmpl,NONE,1.1.2.1 detail.tmpl,NONE,1.1.2.1 detailprint.tmpl,NONE,1.1.2.1 moredetail.tmpl,NONE,1.1.2.1 searchresults.tmpl,NONE,1.1.2.1 subject.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28329/intranet-tmpl/default/zh-TW/catalogue Added Files: Tag: rel_2_0 MARCdetail.tmpl catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl detailprint.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Log Message: CVS seems to hate branches, or something Really Bad like that. I hope I have done the correct things to add these missing files back. --- NEW FILE ---
    /images/background-mem.gif">
    ">//images/fileopen.png"> //images/edittrash.png"> ">一般 ')">åˆ—å° ')">新增至虛擬書架 機讀格å¼æ›¸ç›®ï¼š
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    圖書資料
    		class="button">é ç´„
    --- NEW FILE ---

    館è—查詢

    æ¢ç¢¼ 　　或
     
    說明
    查詢：使用愈多欄ä½æŸ¥è©¢ï¼ŒæŸ¥è©¢å°±æ„ˆæ…¢ã€‚
    é—œéµå­—
    é¡Œå 一般 Exact
    著者
    繪圖
    æœå¨åˆ†é¡žè™Ÿ
    類別
    或
    主題
    虛擬書架

    --- NEW FILE --- 查詢çµæžœ
    é¡Œå著者æœå¨åˆ†é¡žè™Ÿ
    &startfrom=>上一筆 &startfrom=>下一筆

    共筆記錄中的第至項。
    --- NEW FILE --- ()

    書目記錄

    副題：
    著者：
    附加著者：
    集å¢é¡Œå：
    主題：
    版權：
    備註：
    劃一題å：
    期刊：
    圖書資料總數：

    圖書資料類別 類別 館è—地 到期日 最近出ç¾
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    --- NEW FILE ---
    >é ç´„
    ()

    書目記錄

    " class="button">機讀格å¼

    國際標準書號：">
    副題：
    著者：">
    附加著者：
    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    期刊：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    圖書資料總數：

    圖書資料類別 館è—地 到期日 æœ€è¿‘å‡ºç¾ æ¢ç¢¼ Volume
    &item=&bib=&bi="> &item=>改正圖書資資類別
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    連çµè‡³ 相關網站
    é¡Œå：
    說明：
    網å€ï¼š">http://
    --> --- NEW FILE ---
    書目記錄



    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    ISBN：
    ,
    --- NEW FILE ---


    >é ç´„

    &type=intra> ()

    > >
    /images/background-mem.gif" > 群組 -
    //images/fileopen.png"> //images/edittrash.png">
    書目記錄號碼：
    圖書資料類別：
    網å€ï¼š
    借閱期é™ï¼š
    借書費用：
    分類：
    ISBN：
    出版者：
    出版地：
    日期：
    集å¢è™Ÿï¼š
    é æ•¸ï¼š
    繪圖：
    大å°ï¼š
    備註：
    數é‡ï¼š
    /images/holder.gif" width=16 height=300 align=left>
    /images/background-mem.gif">æ¢ç¢¼
    > > > //images/fileopen.png"> //images/edittrash.png">
    所屬分館：
    最近見éŽï¼š
    上次借出日期：
    上次借書讀者1：
    上次借書讀者2：
    ç›®å‰é¤¨åˆ¥ï¼š
    書價：
    圖書資料已éºå¤±ï¼š
    Paid for:
    備註：
    續借：
    &biblio=&invoice=&catview=yes">登錄日期：
    å·²å–消：
    &bi=&itm=>總借出：
    群組號碼：
    書目記錄號碼：

    --- NEW FILE ---
    您的查詢是按 您沒有指定查詢æ¢ä»¶
    找到 ç­†çµæžœ

    &=&type=opacintra>/images/numbers/prev.gif border=0> /images/numbers/placeholder.gif border=0> /images/numbers/-highlight.gif> &=&type=opacintra>/images/numbers/.gif border=0> &=&type=opacintra>/images/numbers/next.gif border=0> /images/numbers/placeholder.gif border=0>

    bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    é¡Œå著者©æ•¸é‡é¤¨è—地  
    ?type=opacintra&bib=> &type=opacintra> >é ç´„ ä¸å¯é ç´„
    bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    &=&type=opacintra>上一筆   &=&type=opacintra>下一筆  

    共筆記錄中的第至項。

    請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ 請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ --- NEW FILE ---
    主題
    ">上一筆 ">下一筆

    共筆記錄中的第至項。
    From acli at users.sourceforge.net Tue Feb 24 07:07:13 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 22:07:13 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3.2.3,1.3.2.4 aqbookfund.tmpl,1.2.2.2,1.2.2.3 aqbudget.tmpl,1.2.2.1,1.2.2.2 authorised_values.tmpl,1.1.2.1,1.1.2.2 branches.tmpl,1.6.2.2,1.6.2.3 categorie.tmpl,NONE,1.1.2.1 categoryitem.tmpl,NONE,1.1.2.1 charges.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 currency.tmpl,1.1.2.3,1.1.2.4 itemtypes.tmpl,1.2.2.1,1.2.2.2 koha2marclinks.tmpl,1.3.2.1,1.3.2.2 marc_subfields_structure.tmpl,1.4.2.1,1.4.2.2 marctagstructure.tmpl,1.4.2.1,1.4.2.2 printers.tmpl,1.1.2.2,1.1.2.3 stopwords.tmpl,NONE,1.1.2.1 systempreferences.tmpl,1.3.2.3,1.3.2.4 thesaurus.tmpl,1.1.2.1,1.1.2.2 z3950servers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28329/intranet-tmpl/default/zh-TW/parameters Added Files: Tag: rel_2_0 admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: CVS seems to hate branches, or something Really Bad like that. I hope I have done the correct things to add these missing files back. --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明  
    登記有效期
    年齡上é™
    必須填寫年齡
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
     
    資料已寫入
    method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥ 是å¦
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    這個記錄目å‰ç”¨äº† 次，ä¸å¯ç§»é™¤
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記有效期 登記手續費 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    是 å¦ /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明 >  
    登記有效期 >
    å¹´é½¡ä¸Šé™ >
    必須填寫年齡 >
    罰款類別 >
    Bulk >
    登記手續費 >
    è¦ç™¼éŽæœŸé€šçŸ¥ >
    é™å€Ÿæ•¸é‡ >
    é ç´„手續費 >
     
    資料已寫入 method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    Bulk
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    這個記錄目å‰ç”¨äº† 次，ä¸å¯ç§»é™¤
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 Bulk 費用 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    修改 移除


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    測試 çµæžœ
    圖書資料號碼
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    å¥½ï¼ itemnum : the field itemnumber is mapped to a field in tab -1
    åœ–æ›¸è³‡æ–™ç›¸é—œæ¬„ä½ åœ–æ›¸è³‡æ–™çš„æ‰€æœ‰æ¬„ä½éƒ½å¿…須：
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    å¥½ï¼ All item fields are in the same tag and in item tab
    itemtypes table 是空白的 itemtypes table是空白的，它必須有至少一個值
    å¥½ï¼ itemtypes table 有至少一個值
    itemtype NOT mapped biblioitems.itemtype欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為itemtype
    		•
    å¥½ï¼ biblioitems.itemtype 已設定
    branch table 是空白的 branch table是空白的，它必須至少有一個值ï¼
    å¥½ï¼ branch table 有至少一個值
    homebranch 沒有éˆçµ items.homebranch欄必須
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ homebranch 已設定
    holdingbranch 沒有éˆçµ items.holdingbranch欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ holdingbranch 已設定
    書目åŠæ›¸ç›®è¨˜éŒ„號碼 biblio.biblionumber åŠ biblioitems.biblioitemnumber 欄ä½å¿…須：
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    å¥½ï¼ biblionumber åŠ biblioitemnumber å·²éˆçµå¦¥ç•¶
    總計 您的機讀格å¼è¨­å®šæœ‰å€‹éŒ¯èª¤ã€‚使用Kohaå‰è«‹å…ˆè¦æ”¹æ­£å®ƒå€‘。
      Configuration OK, you don't have errors in your MARC parameters table
    --- NEW FILE ---

    修改字眼

    新增字眼

    字眼
    字眼
    資料已寫入
    字眼
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Stop word 管ç†

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    您查詢
    字眼
    移除
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    --- NEW FILE ---

    修改Z39.50伺æœå™¨

    新增Z39.50伺æœå™¨

    Z39.50伺æœå™¨
    Z39.50伺æœå™¨
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨ (查詢時é è¨­ç‚ºä½¿ç”¨)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    資料已寫入
    >
    å稱
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨
    Rank
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Z39.50伺æœå™¨ç®¡ç†

    >
    您查詢
    å稱 主機å稱 埠 資料庫 使用者ID 密碼 é è¨­ä½¿ç”¨ Rank Syntax
    //images/fileopen.png" alt="修改" title="修改" border=0> //images/edittrash.png" alt="移除" title="移除" border=0>
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    From acli at users.sourceforge.net Tue Feb 24 15:20:49 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 06:20:49 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.12,1.13 xgettext.pl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23699 Modified Files: tmpl_process3.pl xgettext.pl Log Message: tmpl_process3.pl did not know how to handle absolute pathnames in -i. (Actually, xgettext.pl did not know how to handle them in the files listed in the list of files.) If the po file is empty (corrupted), $href->{'""'} will be undefined. We just blindly dereferenced this null value without checking. Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** tmpl_process3.pl 24 Feb 2004 00:47:53 -0000 1.12 --- tmpl_process3.pl 24 Feb 2004 14:20:46 -0000 1.13 *************** *** 222,225 **** --- 222,227 ---- # guess the charsets. HTML::Templates defaults to iso-8859-1 if (defined $href) { + die "$str_file: PO file is corrupted, or not a PO file\n" + unless defined $href->{'""'}; $charset_out = TmplTokenizer::charset_canon $2 if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/; *************** *** 242,246 **** if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added ! die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); # Generate the temporary file that acts as /POTFILES.in --- 244,252 ---- if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added ! if (!-s $str_file) { ! warn "Removing empty file $str_file\n"; ! unlink $str_file || die "$str_file: $!\n"; ! } ! die "$str_file: Output file already exists\n" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); # Generate the temporary file that acts as /POTFILES.in Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** xgettext.pl 24 Feb 2004 00:48:18 -0000 1.8 --- xgettext.pl 24 Feb 2004 14:20:46 -0000 1.9 *************** *** 292,299 **** while () { chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! print STDERR "$0: Processing file \"$directory/$_\"\n" if $verbose_p; text_extract( $h ); } --- 292,300 ---- while () { chomp; ! my $input = /^\//? $_: "$directory/$_"; ! my $h = TmplTokenizer->new( $input ); $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name $input; ! print STDERR "$0: Processing file \"$input\"\n" if $verbose_p; text_extract( $h ); } From oleonard at users.sourceforge.net Tue Feb 24 17:17:24 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:17:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.18.2.1,1.18.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18004/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: Tag: rel_2_0 branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Also quoted all attributes in HTML. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -C2 -r1.18.2.1 -r1.18.2.2 *** branches.tmpl 6 Feb 2004 14:12:27 -0000 1.18.2.1 --- branches.tmpl 24 Feb 2004 16:17:22 -0000 1.18.2.2 *************** *** 1,18 **** ! !


    !
    ! --- 1,18 ---- ! !


    ! " name="Aform" method="post"> !
    Branch code ! ! ! !
    *************** *** 20,31 **** ! ! ! ! --- 20,31 ---- ! ! ! ! *************** *** 34,62 **** ! ! ! ! ! ! !
    Branch code ! ! "> ! ! ">
    Name"> 
    >
    Name"> 
    " >
    Address
     
     
    Phone
    Fax
    E-mail
     
    --- 34,62 ----
    Address">
     ">
     ">
    Phone">
    Fax">
    E-mail">
     
    *************** *** 64,138 **** ! Confirm delete: ! ! ! > !

    ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 64,138 ---- ! Confirm delete: ! " method="post"> ! ! > ! " method="post"> ! !


    ! !
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    ! ! !
    		!
    ! !
    ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! *************** *** 141,179 ****
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    " method="post"> ! ! "> !
    		!
    " method="post"> ! "> !

    !
    method=post> ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 141,179 ----
    ! Branches Categories
    NameCodeDescription    
    !
    ! !
    		!
    ! !

    !
    method="post"> ! !

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! *************** *** 182,204 ****
    ! Branches Categories
    NameCodeDescription    
    !
    " method="post"> ! ! ">
    		!
    " method="post"> ! "> !

    !
    method=post> ! !
    ! !


    !
    ! --- 182,204 ----
    Category code ! ! ! !

    ! method="post"> ! !
    ! !


    !
    " name="Aform" method="post"> ! *************** *** 206,217 **** ! ! !
    Category code ! ! "> ! ! ">
    Name"> 
    Description"> 
    --- 206,217 ----
    Name"> 
    Description"> 
    *************** *** 219,230 **** ! Confirm delete: ! ! ! !
    --- 219,230 ---- ! Confirm delete: !
    " method="post"> ! ! ">
    !
    " method="post">
    From oleonard at users.sourceforge.net Tue Feb 24 17:40:14 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:40:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23510/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Also quoted all attributes in HTML. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** branches.tmpl 11 Feb 2004 09:02:55 -0000 1.19 --- branches.tmpl 24 Feb 2004 16:40:11 -0000 1.20 *************** *** 1,18 **** ! !


    !
    ! --- 1,18 ---- ! !


    ! " name="Aform" method="post"> !
    Branch code ! ! ! !
    *************** *** 20,31 **** ! ! ! ! --- 20,31 ---- ! ! ! ! *************** *** 34,62 **** ! ! ! ! ! ! !
    Branch code ! ! "> ! ! ">
    Name"> 
    >
    Name"> 
    " >
    Address
     
     
    Phone
    Fax
    E-mail
     
    --- 34,62 ---- Address ! ">   ! ">   ! "> Phone ! "> Fax ! "> E-mail ! ">   ! *************** *** 64,138 **** ! Confirm delete: ! ! ! >
    !
    ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 64,138 ---- ! Confirm delete: ! " method="post"> ! ! > ! " method="post"> ! !


    ! !
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    ! ! !
    		!
    ! !
    ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! *************** *** 141,179 ****
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    " method="post"> ! ! "> !
    		!
    " method="post"> ! "> !

    !
    method=post> ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 141,179 ----
    ! Branches Categories
    NameCodeDescription    
    !
    ! !
    		!
    ! !

    !
    method="post"> ! !

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! *************** *** 182,204 ****
    ! Branches Categories
    NameCodeDescription    
    !
    " method="post"> ! ! ">
    		!
    " method="post"> ! "> !

    !
    method=post> ! !
    ! !


    !
    ! --- 182,204 ----
    Category code ! ! ! !

    ! method="post"> ! !
    ! !


    !
    " name="Aform" method="post"> ! *************** *** 206,217 **** ! ! !
    Category code ! ! "> ! ! ">
    Name"> 
    Description"> 
    --- 206,217 ---- Name ! ">  Description ! ">  ! *************** *** 219,230 **** ! Confirm delete: ! ! !
    !
    --- 219,230 ---- ! Confirm delete: !
    " method="post"> ! ! ">
    !
    " method="post">
    From oleonard at users.sourceforge.net Tue Feb 24 17:41:25 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:41:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters branches.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23736/koha-tmpl/intranet-tmpl/npl/en/parameters Modified Files: branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/branches.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** branches.tmpl 19 Feb 2004 19:14:35 -0000 1.1 --- branches.tmpl 24 Feb 2004 16:41:14 -0000 1.2 *************** *** 16,20 **** ! " /> --- 16,20 ---- ! " /> From acli at users.sourceforge.net Wed Feb 25 04:37:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 19:37:29 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator VerboseWarnings.pm,1.3,1.4 tmpl_process3.pl,1.13,1.14 xgettext.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9253 Modified Files: VerboseWarnings.pm tmpl_process3.pl xgettext.pl Log Message: Benedict wants some message at the end that says success or failure. It's a good idea too. Index: VerboseWarnings.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/VerboseWarnings.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** VerboseWarnings.pm 23 Feb 2004 19:56:47 -0000 1.3 --- VerboseWarnings.pm 25 Feb 2004 03:37:27 -0000 1.4 *************** *** 26,37 **** --- 26,44 ---- @EXPORT_OK = qw( &pedantic_p + &warn_additional &warn_normal &warn_pedantic + &error_additional &error_normal ); + %EXPORT_TAGS = ( + 'warn' => [ 'warn_additional', 'warn_normal', 'warn_pedantic' ], + 'die' => [ 'error_additional', 'error_normal' ], + ); ############################################################################### use vars qw( $appName $input $input_abbr $pedantic_p $pedantic_tag ); + use vars qw( $warned $erred ); sub set_application_name ($) { *************** *** 40,43 **** --- 47,54 ---- } + sub application_name () { + return $appName; + } + sub set_input_file_name ($) { my($s) = @_; *************** *** 71,75 **** } ! sub warn_normal ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('Warning', $lc); --- 82,86 ---- } ! sub warn_additional ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('Warning', $lc); *************** *** 78,81 **** --- 89,98 ---- } + sub warn_normal ($$) { + my($msg, $lc) = @_; + $warned += 1; + warn_additional($msg, $lc); + } + sub warn_pedantic ($$$) { my($msg, $lc, $flag) = @_; *************** *** 88,94 **** $$flag = 1; } } ! sub error_normal ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('ERROR', $lc); --- 105,112 ---- $$flag = 1; } + $warned += 1; } ! sub error_additional ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('ERROR', $lc); *************** *** 97,99 **** --- 115,127 ---- } + sub error_normal ($$) { + my($msg, $lc) = @_; + $erred += 1; + error_additional($msg, $lc); + } + + sub warned () { + return $warned; # number of times warned + } + ############################################################################### Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** tmpl_process3.pl 24 Feb 2004 14:20:46 -0000 1.13 --- tmpl_process3.pl 25 Feb 2004 03:37:27 -0000 1.14 *************** *** 17,21 **** use File::Temp qw( :POSIX ); use TmplTokenizer; ! use VerboseWarnings qw( error_normal warn_normal ); ############################################################################### --- 17,21 ---- use File::Temp qw( :POSIX ); use TmplTokenizer; ! use VerboseWarnings qw( :warn :die ); ############################################################################### *************** *** 150,153 **** --- 150,154 ---- The -o option is ignored for the "create" and "update" actions. + Try `perldoc $0' for perhaps more information. EOF exit($exitcode); *************** *** 155,158 **** --- 156,160 ---- ############################################################################### + sub usage_error (;$) { for my $msg (split(/\n/, $_[0])) { *************** *** 241,244 **** --- 243,247 ---- my $xgettext = './xgettext.pl'; # actual text extractor script + my $st; if ($action eq 'create') { *************** *** 256,262 **** close $tmph; # Generate the specified po file ($str_file) ! my $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file); warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0; ! unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { --- 259,265 ---- close $tmph; # Generate the specified po file ($str_file) ! $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file); warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0; ! # unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { *************** *** 270,274 **** close $tmph1; # Generate the temporary file that acts as /.pot ! my $st = system($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2, '--po-mode', (defined $charset_in? ('-I', $charset_in): ()), --- 273,277 ---- close $tmph1; # Generate the temporary file that acts as /.pot ! $st = system($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2, '--po-mode', (defined $charset_in? ('-I', $charset_in): ()), *************** *** 278,288 **** # FIXME: msgmerge(1) is a Unix dependency # FIXME: need to check the return value ! system('msgmerge', '-U', '-s', $str_file, $tmpfile2); } else { ! warn_normal "Text extraction failed: $xgettext: $!\n", undef; ! warn_normal "Will not run msgmerge\n", undef; } ! unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; ! unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { --- 281,291 ---- # FIXME: msgmerge(1) is a Unix dependency # FIXME: need to check the return value ! $st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2); } else { ! error_normal "Text extraction failed: $xgettext: $!\n", undef; ! error_additional "Will not run msgmerge\n", undef; } ! # unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; ! # unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { *************** *** 329,332 **** --- 332,342 ---- usage_error('Unknown action specified.'); } + + if ($st == 0) { + printf "The %s seems to be successful, with %d warning(s).\n", + $action, VerboseWarnings::warned; + } else { + printf "%s FAILED.\n", "\u$action"; + } exit 0; Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** xgettext.pl 24 Feb 2004 14:20:46 -0000 1.9 --- xgettext.pl 25 Feb 2004 03:37:27 -0000 1.10 *************** *** 237,240 **** --- 237,242 ---- Informative output: --help Display this help and exit + + Try `perldoc $0' for perhaps more information. EOF exit($exitcode); From acli at users.sourceforge.net Wed Feb 25 04:40:03 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 19:40:03 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.14,1.15 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9623 Modified Files: tmpl_process3.pl Log Message: Bug in previous checkin, because we can't get the number of warnings from the child. Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** tmpl_process3.pl 25 Feb 2004 03:37:27 -0000 1.14 --- tmpl_process3.pl 25 Feb 2004 03:39:49 -0000 1.15 *************** *** 334,339 **** if ($st == 0) { ! printf "The %s seems to be successful, with %d warning(s).\n", ! $action, VerboseWarnings::warned; } else { printf "%s FAILED.\n", "\u$action"; --- 334,338 ---- if ($st == 0) { ! printf "The %s seems to be successful.\n", $action; } else { printf "%s FAILED.\n", "\u$action"; From acli at users.sourceforge.net Wed Feb 25 07:08:46 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:08:46 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1842 Modified Files: TmplTokenizer.pm Log Message: This should make it handle commenting out of whole blocks of HTML better. It seems to be still correct, and it is no longer complaining about syntax errors when seeing commented-out HTML (esp. with TMPL_* directives). Don't try to translate stuff between ... too, the stuff in the middle is supposed to be PCDATA. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** TmplTokenizer.pm 23 Feb 2004 18:49:56 -0000 1.25 --- TmplTokenizer.pm 25 Feb 2004 06:08:41 -0000 1.26 *************** *** 34,37 **** --- 34,38 ---- use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); + use vars qw( $pedantic_error_markup_in_pcdata_p ); ############################################################################### *************** *** 63,67 **** # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; --- 64,68 ---- # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:(?!--)(?:$re_directive)*.)*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; *************** *** 92,95 **** --- 93,97 ---- sub CDATA_MODE_P () {'cdata-mode-p'} sub CDATA_CLOSE () {'cdata-close'} + sub PCDATA_MODE_P () {'pcdata-mode-p'} # additional submode for CDATA sub ALLOW_CFORMAT_P () {'allow-cformat-p'} *************** *** 163,166 **** --- 165,173 ---- } + sub pcdata_mode_p { + my $this = shift; + return $this->{+PCDATA_MODE_P}; + } + sub cdata_close { my $this = shift; *************** *** 228,231 **** --- 235,244 ---- } + sub _set_pcdata_mode { + my $this = shift; + $this->{+PCDATA_MODE_P} = $_[0]; + return $this; + } + sub _set_cdata_close { my $this = shift; *************** *** 321,324 **** --- 334,338 ---- } else { # tag/declaration/processing instruction my $ok_p = 0; + my $bad_comment_p = 0; for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { *************** *** 350,359 **** warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; } ! } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); $this->_set_readahead( $' ); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $this->line_number_start; ! $this->_set_syntaxerror( 1 ); } last if $ok_p; --- 364,372 ---- warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; } ! } elsif ($this->_peek_readahead =~ /^)$re_directive*.)*-->/os) { ($kind, $it) = (TmplTokenType::COMMENT, $&); $this->_set_readahead( $' ); $ok_p = 1; ! $bad_comment_p = 1; } last if $ok_p; *************** *** 377,380 **** --- 390,397 ---- if ($it =~ /^$re_directive/ios && !$this->cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; + } elsif ($bad_comment_p) { + warn_normal sprintf("Syntax error in comment: %s\n", $it), + $this->line_number_start; + $this->_set_syntaxerror( 1 ); } if (!$ok_p && $eof_p) { *************** *** 401,404 **** --- 418,426 ---- $this->_set_cdata_mode( 1 ); $this->_set_cdata_close( "" ); + $this->_set_pcdata_mode( 0 ); + } elsif ($it->string =~ /^<(title)\b/is) { + $this->_set_cdata_mode( 1 ); + $this->_set_cdata_close( "" ); + $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); *************** *** 415,419 **** --- 437,449 ---- $it .= $next->string; } + if ($this->pcdata_mode_p) { + my $check = $it; + $check =~ s/$re_directive//gos; + warn_pedantic "Markup found in PCDATA\n", $this->line_number, + \$pedantic_error_markup_in_pcdata_p + if $check =~ /$re_tag_compat/s; + } $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); + $this->_set_pcdata_mode, 0; $this->_set_cdata_close, undef; } From acli at users.sourceforge.net Wed Feb 25 07:25:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:25:31 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.26,1.27 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4769 Modified Files: TmplTokenizer.pm Log Message: After the previous change, the scanner will hang if the input is malformed in a certain way, such as having a but not matching . This should fix it. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** TmplTokenizer.pm 25 Feb 2004 06:08:41 -0000 1.26 --- TmplTokenizer.pm 25 Feb 2004 06:25:29 -0000 1.27 *************** *** 427,433 **** } } else { for ($it = '', my $cdata_close = $this->cdata_close;;) { my $next = $this->_next_token_internal($h); ! last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/is) { $this->_push_readahead( $next ); # push entire TmplToken object --- 427,435 ---- } } else { + my $eof_p = 0; for ($it = '', my $cdata_close = $this->cdata_close;;) { my $next = $this->_next_token_internal($h); ! $eof_p = !defined $next; ! last if $eof_p; if (defined $next && $next->string =~ /$cdata_close/is) { $this->_push_readahead( $next ); # push entire TmplToken object *************** *** 437,440 **** --- 439,450 ---- $it .= $next->string; } + if ($eof_p) { + $it = undef; + error_normal "Unexpected end of file while looking for " + . $this->cdata_close + . "\n", $this->line_number_start; + $this->_set_fatal( 1 ); + $this->_set_syntaxerror( 1 ); + } if ($this->pcdata_mode_p) { my $check = $it; *************** *** 444,450 **** if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); $this->_set_pcdata_mode, 0; ! $this->_set_cdata_close, undef; } return $it; --- 454,461 ---- if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ) ! if defined $it; $this->_set_pcdata_mode, 0; ! $this->_set_cdata_close, undef unless !defined $it; } return $it; From acli at users.sourceforge.net Wed Feb 25 07:49:37 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:49:37 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.27,1.28 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9557 Modified Files: TmplTokenizer.pm Log Message: Try to be a little bit more helpful with "Strange attribute syntax..." warnings. (Actually, is syntax like foo="bar"foo="bar" actually valid?) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** TmplTokenizer.pm 25 Feb 2004 06:25:29 -0000 1.27 --- TmplTokenizer.pm 25 Feb 2004 06:49:35 -0000 1.28 *************** *** 296,300 **** $this->_set_fatal( 1 ); } else { ! warn_normal "Strange attribute syntax: $s\n", $lc; } } --- 296,306 ---- $this->_set_fatal( 1 ); } else { ! # There's something wrong with the attribute syntax. ! # We might be able to deduce a likely cause by looking more. ! if ($s =~ /^[a-z0-9]/is && "" =~ /^$re_tag_compat$/s) { ! warn_normal "Probably missing whitespace before or missing quotation mark near: $s\n", $lc; ! } else { ! warn_normal "Strange attribute syntax: $s\n", $lc; ! } } } From acli at users.sourceforge.net Wed Feb 25 07:56:44 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:56:44 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.28,1.29 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10792 Modified Files: TmplTokenizer.pm Log Message: Ugly hack to avoid screenfuls of spurious warnings about "Possible SGML closed tag notation" Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** TmplTokenizer.pm 25 Feb 2004 06:49:35 -0000 1.28 --- TmplTokenizer.pm 25 Feb 2004 06:56:42 -0000 1.29 *************** *** 362,367 **** --- 362,373 ---- if ($tail eq '' && $post =~ $re_tmpl_var) { # Don't bother to show the warning if we're too confused + # FIXME. There's no method for _closed_start_tag_warning + if (!defined $this->{'_closed_start_tag_warning'} + || ($this->{'_closed_start_tag_warning'}->[0] eq $head + && $this->{'_closed_start_tag_warning'}->[1] != $this->line_number - 1)) { warn_normal "Possible SGML \"closed start tag\" notation: $head<\n", $this->line_number if split(/\n/, $head) < 10; + } + $this->{'_closed_start_tag_warning'} = [$head, $this->line_number]; } else { ($kind, $it) = (TmplTokenType::TAG, "$head>"); From acli at users.sourceforge.net Wed Feb 25 09:16:27 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Wed, 25 Feb 2004 00:16:27 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.29,1.30 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23579 Modified Files: TmplTokenizer.pm Log Message: This should now handle spurious "strange attribute syntax" much more sanely. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** TmplTokenizer.pm 25 Feb 2004 06:56:42 -0000 1.29 --- TmplTokenizer.pm 25 Feb 2004 08:16:24 -0000 1.30 *************** *** 259,264 **** my($s, $lc) = @_; my %attr; ! $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { --- 259,264 ---- my($s, $lc) = @_; my %attr; ! $s = $1 if $s =~ /^<(?:(?!$re_directive_control)\S)+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<(?:(?!$re_directive_control)\S)+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { *************** *** 431,438 **** $this->_set_cdata_close( "" ); $this->_set_pcdata_mode( 0 ); ! } elsif ($it->string =~ /^<(title)\b/is) { ! $this->_set_cdata_mode( 1 ); ! $this->_set_cdata_close( "" ); ! $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); --- 431,438 ---- $this->_set_cdata_close( "" ); $this->_set_pcdata_mode( 0 ); ! # } elsif ($it->string =~ /^<(title)\b/is) { ! # $this->_set_cdata_mode( 1 ); ! # $this->_set_cdata_close( "" ); ! # $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); *************** *** 466,470 **** if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ) if defined $it; $this->_set_pcdata_mode, 0; --- 466,475 ---- if $check =~ /$re_tag_compat/s; } ! # PCDATA should be treated as text, not CDATA ! # Actually it should be treated as TEXT_PARAMETRIZED :-( ! $it = TmplToken->new( $it, ! ($this->pcdata_mode_p? ! TmplTokenType::TEXT: TmplTokenType::CDATA), ! $this->line_number ) if defined $it; $this->_set_pcdata_mode, 0; *************** *** 856,859 **** --- 861,868 ---- turned on using the set_cformat(1) method call. + =head1 BUGS + + There is no code to save the tag name anywhere in the scanned token. + =head1 HISTORY From acli at users.sourceforge.net Wed Feb 25 09:16:37 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Wed, 25 Feb 2004 00:16:37 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.17,1.18 opac.zh_TW,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23668 Modified Files: intranet.zh_TW opac.zh_TW Log Message: Minor updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** intranet.zh_TW 24 Feb 2004 00:48:18 -0000 1.17 --- intranet.zh_TW 25 Feb 2004 08:16:34 -0000 1.18 *************** *** 4,7 **** --- 4,9 ---- # Copyright 2004 Ambrose Li # + # $Header$ + # # FIXME words tentatively translated: active, home branch, illustration, illustrator, inactive, order, receive, seen # FIXME tentative: bookfund: 書ç±è³¼ç½®è³‡é‡‘ *************** *** 12,16 **** msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-23 17:20-0500\n" "Last-Translator: Ambrose Li \n" --- 14,18 ---- msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-25 03:08-0500\n" "PO-Revision-Date: 2004-02-23 17:20-0500\n" "Last-Translator: Ambrose Li \n" *************** *** 25,32 **** msgstr "\" %s" - #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:41 - msgid "\">" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:14 msgid "$ rrp" --- 27,30 ---- *************** *** 573,581 **** msgstr "-) 借出" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:131 - #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:44 - msgid "-->" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:108 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:165 --- 571,574 ---- *************** *** 641,645 **** msgstr "-> 供應商" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:3 msgid "2; url=" msgstr "" --- 634,638 ---- msgstr "-> 供應商" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:4 msgid "2; url=" msgstr "" *************** *** 832,840 **** msgstr "日期：%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:123 - #, c-format - msgid "Description: %s" - msgstr "說明：%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:50 #, c-format --- 825,828 ---- *************** *** 1073,1082 **** #, c-format msgid "This record is used %s times. Deletion not possible" ! msgstr "" ! ! #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:122 ! #, c-format ! msgid "Title: %s" ! msgstr "é¡Œå：%s" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:31 --- 1061,1065 ---- #, c-format msgid "This record is used %s times. Deletion not possible" ! msgstr "這個記錄目å‰ç”¨äº† %s 次，ä¸å¯ç§»é™¤" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:31 *************** *** 1108,1116 **** msgstr "網å€ï¼š%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:124 - #, c-format - msgid "URL:http://%s" - msgstr "網å€ï¼šhttp://%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:29 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:39 --- 1091,1094 ---- *************** *** 1293,1297 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:28 msgid "ACTUAL" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:73 --- 1271,1275 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:28 msgid "ACTUAL" ! msgstr "實際" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:73 *************** *** 1728,1735 **** msgstr "地å€" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:118 - msgid "Associated Websites" - msgstr "相關網站" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:55 #, c-format --- 1706,1709 ---- *************** *** 1761,1765 **** #: ../../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:15 msgid "Author" msgstr "著者" --- 1735,1739 ---- #: ../../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 msgid "Author" msgstr "著者" *************** *** 1892,1896 **** msgstr "書目記錄號碼" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:9 msgid "Biblios found" msgstr "找到書目" --- 1866,1870 ---- msgstr "書目記錄號碼" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:10 msgid "Biblios found" msgstr "找到書目" *************** *** 3222,3226 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:68 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:28 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:16 msgid "ISBN" msgstr "ISBN" --- 3196,3200 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:68 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:28 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:17 msgid "ISBN" msgstr "ISBN" *************** *** 3326,3330 **** msgstr "匯入çµæžœï¼š" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:28 msgid "Import this biblio" msgstr "匯入這個書目" --- 3300,3304 ---- msgstr "匯入çµæžœï¼š" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:29 msgid "Import this biblio" msgstr "匯入這個書目" *************** *** 3753,3760 **** msgstr "連çµKohaåŠæ©Ÿè®€æ ¼å¼è³‡æ–™åº«" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:117 - msgid "Links to" - msgstr "連çµè‡³" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:140 msgid "List Item Price Includes GST" --- 3727,3730 ---- *************** *** 3967,3971 **** #, fuzzy msgid "Mark seen" ! msgstr "Mike Hansen" #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:82 --- 3937,3941 ---- #, fuzzy msgid "Mark seen" ! msgstr "最近出ç¾" #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:82 *************** *** 4363,4372 **** msgstr "éžå°èªªé¡ž" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:18 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:20 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:46 - #, fuzzy msgid "Normal" ! msgstr "æ ¼å¼" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:131 --- 4333,4342 ---- msgstr "éžå°èªªé¡ž" + # FIXME This does not seem too sound. The code looks puzzling. Need to re-check. #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:18 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:20 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:46 msgid "Normal" ! msgstr "一般" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:131 *************** *** 4434,4438 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:55 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:88 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:32 msgid "Nothing found" msgstr "什麼也找ä¸åˆ°" --- 4404,4408 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:55 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:88 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:33 msgid "Nothing found" msgstr "什麼也找ä¸åˆ°" *************** *** 5569,5573 **** msgstr "ä¸è¦é‡è¨­åˆ°æœŸæ—¥" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:35 #, c-format msgid "Still %s requests to go" --- 5539,5543 ---- msgstr "ä¸è¦é‡è¨­åˆ°æœŸæ—¥" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:36 #, c-format msgid "Still %s requests to go" *************** *** 5907,5911 **** #: ../../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:14 msgid "Title" msgstr "é¡Œå" --- 5877,5881 ---- #: ../../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 msgid "Title" msgstr "é¡Œå" *************** *** 6428,6432 **** msgstr "Z39.50伺æœå™¨ç®¡ç†" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:5 msgid "Z3950 Search Results" msgstr "Z3950查詢çµæžœ" --- 6398,6402 ---- msgstr "Z39.50伺æœå™¨ç®¡ç†" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:6 msgid "Z3950 Search Results" msgstr "Z3950查詢çµæžœ" *************** *** 6535,6541 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:69 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:17 msgid "coming from" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:29 --- 6505,6511 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:69 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:18 msgid "coming from" ! msgstr "æºè‡ª" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:29 *************** *** 6546,6552 **** #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:12 - #, fuzzy msgid "dir. de publication" ! msgstr "出版地：" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:262 --- 6516,6521 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:12 msgid "dir. de publication" ! msgstr "編輯" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:262 *************** *** 6831,6834 **** --- 6800,6804 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:7 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:7 + #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:2 msgid "text/html; charset=iso-8859-1" msgstr "text/html; charset=utf-8" *************** *** 6917,6918 **** --- 6887,7006 ---- msgid "z3950 search" msgstr "z3950查詢" + + #, fuzzy + #~ msgid "    - - Average Borrowings" + #~ msgstr "　　- - 借書讀者總數" + + #, fuzzy + #~ msgid "    - - Total Borrowings" + #~ msgstr "　　- - 借書讀者總數" + + #, fuzzy + #~ msgid "    - - Update Details" + #~ msgstr "　　- 供應商資料" + + #, fuzzy + #~ msgid "    - All Books Out" + #~ msgstr "　　- - 書藉" + + #, fuzzy + #~ msgid "    - Audit Reports" + #~ msgstr "　　- 報表" + + #, fuzzy + #~ msgid "    - Catalogue Search" + #~ msgstr "　　- å–消訂單" + + #, fuzzy + #~ msgid "    - Fundview CD" + #~ msgstr "　　- Levin" + + #, fuzzy + #~ msgid "    - History" + #~ msgstr "　　- Foxton" + + #, fuzzy + #~ msgid "    - Intranet Help" + #~ msgstr "　　- 設定" + + #, fuzzy + #~ msgid "    - Member Details" + #~ msgstr "　　- 供應商資料" + + #, fuzzy + #~ msgid "    - Messages" + #~ msgstr "　　- 移除" + + #~ msgid "    - Overdues" + #~ msgstr "　　- éŽæœŸ" + + #~ msgid "    - Renew Books" + #~ msgstr "　　- 續借" + + #~ msgid "    - Searching Help" + #~ msgstr "　　- 查詢說明" + + #~ msgid "    - Set New Budgets" + #~ msgstr "　　- 建立新é ç®—案" + + #, fuzzy + #~ msgid "    - Stocktake" + #~ msgstr "　　- 設定" + + #, fuzzy + #~ msgid "    - Telnet Help" + #~ msgstr "　　- 移除" + + #, fuzzy + #~ msgid "-> Borrower Enquiry" + #~ msgstr "讀者號碼" + + #~ msgid "-> Help" + #~ msgstr "-> 線上說明" + + #, fuzzy + #~ msgid "-> Resources" + #~ msgstr "-> 還書" + + #~ msgid "Description: %s" + #~ msgstr "說明：%s" + + #~ msgid "Title: %s" + #~ msgstr "é¡Œå：%s" + + #~ msgid "URL:http://%s" + #~ msgstr "網å€ï¼šhttp://%s" + + #~ msgid "Add to shelf" + #~ msgstr "新增至虛擬書架" + + #~ msgid "Add to virtual shelf" + #~ msgstr "新增至虛擬書架" + + #~ msgid "Add to virtual shelf : %s" + #~ msgstr "新增至虛擬書架：%s" + + #~ msgid "Associated Websites" + #~ msgstr "相關網站" + + #~ msgid "Author : %s" + #~ msgstr "著者：%s" + + #~ msgid "Links to" + #~ msgstr "連çµè‡³" + + #~ msgid "Not Reservable" + #~ msgstr "ä¸å¯é ç´„" + + #~ msgid "OTHER" + #~ msgstr "其他" + + #~ msgid "Title : %s" + #~ msgstr "é¡Œå：%s" + + #~ msgid "select" + #~ msgstr "é¸æ“‡" + + # XXX can improve + #~ msgid "you are in ISSUES & RETURNS" + #~ msgstr "你在此：借出åŠé‚„書" Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac.zh_TW 24 Feb 2004 03:21:37 -0000 1.8 --- opac.zh_TW 25 Feb 2004 08:16:34 -0000 1.9 *************** *** 7,11 **** msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-23 22:05-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" --- 7,11 ---- msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-25 03:21-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" From oleonard at users.sourceforge.net Wed Feb 25 18:28:47 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:28:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6866/koha-tmpl/intranet-tmpl/npl/en/acqui Modified Files: acqui-home.tmpl Log Message: Minor correction to HTML (closing input tags) Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acqui-home.tmpl 19 Feb 2004 18:59:36 -0000 1.1 --- acqui-home.tmpl 25 Feb 2004 17:28:43 -0000 1.2 *************** *** 27,31 **** ! --- 27,31 ---- ! *************** *** 47,52 ****
    ! ! " name="" value="">
    --- 47,52 ----
    ! ! " name="" value="" />
    From oleonard at users.sourceforge.net Wed Feb 25 18:51:16 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:51:16 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.64.2.3,1.64.2.4 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11874/circ Modified Files: Tag: rel_2_0 circulation.pl Log Message: Small changes to help fix Bug 436 Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.64.2.3 retrieving revision 1.64.2.4 diff -C2 -r1.64.2.3 -r1.64.2.4 *** circulation.pl 28 Jan 2004 21:50:17 -0000 1.64.2.3 --- circulation.pl 25 Feb 2004 17:51:09 -0000 1.64.2.4 *************** *** 88,92 **** if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "No borrower matched '$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); --- 88,92 ---- if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); *************** *** 230,233 **** --- 230,234 ---- my $tcolor = ''; my $pcolor = ''; + my $od = ''; foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){ my $dd = $book->{'date_due'}; *************** *** 235,245 **** $dd=format_date($dd); $datedue=~s/-//g; - # FIXME - Instead of declaring the font color here, can we set a variable - # that says 'overdue'? Then the template can check for it: if ($datedue < $todaysdate) { ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; --- 236,245 ---- $dd=format_date($dd); $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); + $book->{'od'}=$od; $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; *************** *** 264,274 **** $dd=format_date($dd); my $pcolor = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! # FIXME - See line 233 above regarding overdues ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ --- 264,276 ---- $dd=format_date($dd); my $pcolor = ''; + my $od = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; + $book->{'od'}=$od; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ From oleonard at users.sourceforge.net Wed Feb 25 18:53:51 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:53:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15.2.4,1.15.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12834/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: Tag: rel_2_0 circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15.2.4 retrieving revision 1.15.2.5 diff -C2 -r1.15.2.4 -r1.15.2.5 *** circulation.tmpl 23 Feb 2004 21:22:00 -0000 1.15.2.4 --- circulation.tmpl 25 Feb 2004 17:53:47 -0000 1.15.2.5 *************** *** 5,9 **** ! &printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &branch=&printer=&print=yes"> Next Borrower  *************** *** 14,21 **** !

    Circulation: Issues

    ! Branch: Printer:     Change Settings "> "> --- 14,24 ----
    !

    Circulation: Issues


    ! Branch:
    ! Printer:
    ! Change Settings "> "> +

     

    *************** *** 35,39 **** Branch:
    Printer:
    ! Change Settings"> "> --- 38,42 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 120,124 ****
    !
    /images/background-mem.gif">Messages
    --- 123,127 ---- !
    /images/background-mem.gif">Messages
    No borrower matched
    *************** *** 138,142 ****
    ! --- 141,145 ----
    ! *************** *** 169,173 ****
    ! ! ! ! ! ! ! ! ! ! ! !
    --- 172,176 ---- ! ! --- 187,191 ---- ! *************** *** 222,226 **** !
    *************** *** 184,188 **** Item Barcode:
    Item Barcode:
    ! ! --- 305,309 ---- ! From oleonard at users.sourceforge.net Wed Feb 25 19:20:15 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:20:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19245/koha-tmpl/intranet-tmpl/npl/en/circ Modified Files: circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation.tmpl 19 Feb 2004 19:02:58 -0000 1.1 --- circulation.tmpl 25 Feb 2004 18:20:05 -0000 1.2 *************** *** 55,59 ****
    ! Add a new patron
    --- 55,59 ----
    ! No patron matched Add a new patron
    From kb2qzv at users.sourceforge.net Wed Feb 25 20:49:04 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:49:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters currency.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10320/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: currency.tmpl Log Message: Added > and < instead of << >>. Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** currency.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- currency.tmpl 25 Feb 2004 19:49:01 -0000 1.9 *************** *** 192,196 **** ! << Prev --- 192,196 ---- ! << Prev *************** *** 198,202 **** ! Next >> --- 198,202 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:49:48 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:49:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters printers.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10830/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: printers.tmpl Log Message: Added > and < instead of << >>. Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** printers.tmpl 11 Feb 2004 09:02:55 -0000 1.9 --- printers.tmpl 25 Feb 2004 19:49:46 -0000 1.10 *************** *** 185,189 **** ! << Prev --- 185,189 ---- ! << Prev *************** *** 191,195 **** ! Next >> --- 191,195 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:50:26 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:50:26 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters stopwords.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10978/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: stopwords.tmpl Log Message: Added > and < instead of << >>. Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** stopwords.tmpl 9 Dec 2003 10:29:01 -0000 1.11 --- stopwords.tmpl 25 Feb 2004 19:50:23 -0000 1.12 *************** *** 157,161 **** ! << Prev --- 157,161 ---- ! << Prev *************** *** 163,167 **** ! Next >> --- 163,167 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:51:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:51:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters z3950servers.tmpl,1.12,1.13 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11158/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: z3950servers.tmpl Log Message: Added > and < instead of << >>. Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** z3950servers.tmpl 11 Feb 2004 09:02:55 -0000 1.12 --- z3950servers.tmpl 25 Feb 2004 19:51:08 -0000 1.13 *************** *** 270,274 **** ! << Prev --- 270,274 ---- ! << Prev *************** *** 276,280 **** ! Next >> --- 276,280 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:54:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:54:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue searchresults.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12161/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: searchresults.tmpl Log Message: removal of 2 quotation marks from the bgcolor= so that translator is happy. Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** searchresults.tmpl 20 Feb 2004 02:49:26 -0000 1.9 --- searchresults.tmpl 25 Feb 2004 19:54:57 -0000 1.10 *************** *** 63,67 ****     ! !
    Borrower information
    --- 225,229 ---- ! ! --- 245,249 ---- ! *************** *** 260,264 **** ! --- 263,267 ---- ! *************** *** 270,276 ****
    Borrower information
    *************** *** 242,246 ****
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    >
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    ODUESYes, See below
    ODUESYes, See below
    !
    !
    /images/background-mem.gif"> --- 273,279 ----
    !



    ! ! --- 308,312 ---- ! From oleonard at users.sourceforge.net Wed Feb 25 19:09:31 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:09:31 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.67,1.68 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17014/circ Modified Files: circulation.pl Log Message: Small changes to help fix Bug 436 Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -r1.67 -r1.68 *** circulation.pl 11 Feb 2004 08:42:02 -0000 1.67 --- circulation.pl 25 Feb 2004 18:09:29 -0000 1.68 *************** *** 88,92 **** if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "No borrower matched '$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); --- 88,92 ---- if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); *************** *** 230,233 **** --- 230,234 ---- my $tcolor = ''; my $pcolor = ''; + my $od = ''; foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){ my $dd = $book->{'date_due'}; *************** *** 235,245 **** $dd=format_date($dd); $datedue=~s/-//g; - # FIXME - Instead of declaring the font color here, can we set a variable - # that says 'overdue'? Then the template can check for it: if ($datedue < $todaysdate) { ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; --- 236,245 ---- $dd=format_date($dd); $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); + $book->{'od'}=$od; $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; *************** *** 264,274 **** $dd=format_date($dd); my $pcolor = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! # FIXME - See line 233 above regarding overdues ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ --- 264,276 ---- $dd=format_date($dd); my $pcolor = ''; + my $od = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; + $book->{'od'}=$od; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ From oleonard at users.sourceforge.net Wed Feb 25 19:15:38 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:15:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.17,1.18 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18312/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** circulation.tmpl 20 Feb 2004 02:49:26 -0000 1.17 --- circulation.tmpl 25 Feb 2004 18:15:35 -0000 1.18 *************** *** 120,124 ****
    /images/background-mem.gif"> *************** *** 305,309 ****
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    !
    /images/background-mem.gif">Messages
    --- 120,124 ---- !
    /images/background-mem.gif">Messages
    No borrower matched
    *************** *** 305,309 ****
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif"> ! !
    --- 63,67 ---- ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! ! !
    From kb2qzv at users.sourceforge.net Wed Feb 25 20:56:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:56:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12663/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: branchtransfers.tmpl Log Message: missing ; added to the end of   Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branchtransfers.tmpl 9 Dec 2003 10:29:05 -0000 1.6 --- branchtransfers.tmpl 25 Feb 2004 19:56:55 -0000 1.7 *************** *** 9,13 ****

    Circulation: Transfers


    ! Branch:   Printer:
    Change Settings --- 9,13 ----

    Circulation: Transfers


    ! Branch:   Printer:
    Change Settings From oleonard at users.sourceforge.net Wed Feb 25 21:01:56 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 12:01:56 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.14.2.2,1.14.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13887/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 MARCdetail.tmpl Log Message: Changing French string to English, cleaning up some HTML markup Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -C2 -r1.14.2.2 -r1.14.2.3 *** MARCdetail.tmpl 19 Feb 2004 10:22:46 -0000 1.14.2.2 --- MARCdetail.tmpl 25 Feb 2004 20:01:54 -0000 1.14.2.3 *************** *** 8,24 **** ! ! ! ! ! ! ! ! ! ! ! !
    ! /images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! --- 8,24 ---- !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">Print')">Add to shelf MARC biblio :
    ! /images/background-mem.gif"> *************** *** 103,114 ****
    ! ! ! ! ! ! *************** *** 27,44 **** ! ! --- 50,54 ---- ! " class="button">Request *************** *** 57,63 ****
    !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">Print')">Add to shelf MARC biblio :
    ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    --- 27,44 ----
    ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    *************** *** 50,54 **** ! class="button">Request
    ! /images/background-mem.gif"> --- 57,63 ----
    !
    ! /images/background-mem.gif"> *************** *** 74,80 ****
    ! /images/background-mem.gif"> --- 74,80 ----
    ! /images/background-mem.gif"> *************** *** 91,97 ****
    ! /images/background-mem.gif"> --- 91,97 ----
    ! /images/background-mem.gif"> *************** *** 108,114 ****
    ! /images/background-mem.gif"> --- 108,114 ----
    ! /images/background-mem.gif"> *************** *** 125,131 ****
    ! /images/background-mem.gif"> --- 125,131 ----
    ! /images/background-mem.gif"> *************** *** 142,148 ****
    ! /images/background-mem.gif"> --- 142,148 ----
    ! /images/background-mem.gif"> *************** *** 159,165 ****
    ! /images/background-mem.gif"> --- 159,165 ----
    ! /images/background-mem.gif"> *************** *** 176,182 ****
    ! /images/background-mem.gif"> --- 176,182 ----
    ! /images/background-mem.gif"> *************** *** 193,199 ****
    ! /images/background-mem.gif"> --- 193,199 ----
    ! /images/background-mem.gif"> *************** *** 210,216 ****
    ! /images/background-mem.gif"> --- 210,216 ----
    ! /images/background-mem.gif"> *************** *** 227,231 ****
    /images/background-mem.gif"> --- 227,231 ----
    /images/background-mem.gif"> *************** *** 239,243 **** !

    Modify category

    Dodaj kategoriÄ™

    name=Aform method=post>
    Kod Kategorii >
    Kod Kategorii
    WyjaÅ›nienie  
    Enrollment period
    Górna granica wieku
    Wymagany Wiek
    Enrollment fee
    Overdue notice required
    Issue limit
    Reserve fee
     
    Data recorded
    method=post>
    TOTAL : :
    > Data deleted

    Kategoria admin

    Szukano >
    Kod Kategorii
    Wyjaśnienie
    Enrollment period
    Górna granica wieku
    Wymagany Wiek
    Fine type
    Enrollment fee
    Overdue notice required TakNie
    Issue limit
    Reserve fee
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA
    Kategoria Wyjaśnienie Enrollment period Enrollment fee Górna Granica Wieku Wymagany Wiek Fine Overdue Issue limit Reserve
    Tak Nie /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:31 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members member-password.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6558/members Added Files: Tag: rel_2_0 member-password.tmpl Log Message: translation update --- NEW FILE --- Click here to continue to see Member Info.

    ,

    > You have entered a UserID that already exists. Please choose another one.
    New UserID: >
    New Password: >

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:31 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6558/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: translation update --- NEW FILE ---
    WIERSZ OPISU



    Wydana przez : w , ,
    Kolekcja:
    Przedmiot:
    Rok :
    Uwagi:
    Tytuł Ujednolicony:
    Dewey: ">
    Klasyfikacja:
    LCCN:
    URL: ">
    ISBN:
    ,
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters categoryitem.tmpl,NONE,1.1.2.1 charges.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6713/parameters Added Files: Tag: rel_2_0 categoryitem.tmpl charges.tmpl checkmarc.tmpl Log Message: translation update --- NEW FILE ---

    Modify category

    Dodaj kategoriÄ™

    name=Aform method=post>
    Kod Kategorii >
    Kod Kategorii
    WyjaÅ›nienie >  
    Enrolment period >
    Górna granica wieku >
    Wymagany Wiek >
    Fine type >
    Bulk >
    Enrolment fee >
    Overdue notice required >
    Issue limit >
    Reserve fee >
     
    Data recorded method=post>
    TOTAL : :
    > Data deleted

    Kategoria admin

    Szukano >
    Kod Kategorii
    Wyjaśnienie
    Enrolment period
    Górna granica wieku
    Wymagany Wiek
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA
    Kategoria Wyjaśnienie Enrolment Górna Granica Wieku Wymagany Wiek Fine Bulk Opłata Overdue Issue limit Reserve
    Edytuj Wymaż


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    Test Result
    itemnum
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    OK itemnum : the field itemnumber is mapped to a field in tab -1
    item fields ALL items fields MUST :
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    OK Wszystkie pola pozycji są w tym samym znaczniku i w zakładce pozycji
    itemtypes table empty the itemtypes table is empty. It must contain at least 1 value
    OK itemtypes table filled with at least 1 value
    itemtype NOT mapped the biblioitems.itemtype field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised_value=itemtype
    		•
    OK biblioitems.itemtype defined
    branch table empty the branch table is empty. It must contain at least 1 value !
    OK branch table filled with at least 1 value
    homebranch NOT mapped the items.homebranch field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised value=branches
    		•
    OK homebranch defined
    holdingbranch NOT mapped the items.holdingbranch field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised value=branches
    		•
    OK holdingbranch defined
    biblio and biblionumber The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    OK biblionumber and biblioitemnumber mapped correctly
    TOTAL You have error(s) in your MARC configuration. Please fix them before using koha
      Configuration OK, you don't have errors in your MARC parameters table
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:34:42 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:34:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters currency.tmpl,NONE,1.1.2.1 itemtypes.tmpl,NONE,1.1.2.1 printers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6942/parameters Added Files: Tag: rel_2_0 currency.tmpl itemtypes.tmpl printers.tmpl Log Message: translation update --- NEW FILE ---

    Modify currency

    Dodaj walutÄ™

    Currency
    Currency
    Rate
    Data recorded
    Currency
    Rate
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Currencies admin

    >
    You searched for
    Currency Rate
    Edytuj Wymaż
    << Wstecz        Dalej >>

    --- NEW FILE ---

    Modify item type

    Dodaj typ pozycji

    Typ pozycji>
    Typ pozycji
    WyjaÅ›nienie  
    Not for loan if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item
    Okres wypożyczenia meaningful only if not for loan is not set
    Wolno Przedłużać checked value=1>
    Opłata wynajmu
     
    Typ pozycji
    Wyjaśnienie
    Okres wypożyczenia
    PrzedłużeniaMożliweNot allowed
    Opłata wynajmu
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA

    Typ Pozycji Admin

    Kod Wyjaśnienie Okres wypożyczenia Renewable Opłata Edytuj Wymaż
    TakNie ?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>

    //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> //images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    --- NEW FILE ---

    Modify printer

    Dodaj drukarkÄ™

    Nazwa Drukarki
    Nazwa Drukarki
    Queue
    Typ
    Data recorded
    Drukarka
    Queue
    Typ
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Drukarka Admin (fixme)

    >
    You searched for
    ImiÄ™ i Nazwisko Queue Typ
    Edytuj Wymaż
    << Wstecz        Dalej >>

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:35:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:35:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/reports inventory.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7124/reports Added Files: Tag: rel_2_0 inventory.tmpl Log Message: --- NEW FILE ---

    Inventory/Stocktaking

    Select items you want to check
    Item Location (items.bulk) between "> and ">
    not seen since ">
    show "> items beginning at offset ">
    "> "> "> "> ">
    Seen Kod Paskowy Bulk Tytuł Autor
    " value="1">
    "> "> "> "> ">
    "> "> "> "> ">
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:35:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:35:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters stopwords.tmpl,NONE,1.1.2.1 z3950servers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7124/parameters Added Files: Tag: rel_2_0 stopwords.tmpl z3950servers.tmpl Log Message: --- NEW FILE ---

    Modify word

    Dodaj słowo

    SÅ‚owo
    SÅ‚owo
    Data recorded
    SÅ‚owo
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Stop words admin

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    You searched for
    SÅ‚owo
    Wymaż
    << Wstecz        Dalej >>

    --- NEW FILE ---

    Modify Z39.50 Server

    Dodaj Serwer Z39.50

    Z39.50 Server
    Z39.50 Server
    Hostname
    Port
    Database
    Użytkownik
    Password
    Checked (searched by default)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    Data recorded
    >
    Site
    Hostname
    Port
    Database
    Użytkownik
    Password
    Checked
    Rank
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Z39.50 Servers admin

    >
    You searched for
    Site Hostname Port Database Użytkownik Password Checked Rank Syntax
    //images/fileopen.png" alt="Edytuj" title="edit" border=0> //images/edittrash.png" alt="Wymaż" title="delete" border=0>
    << Wstecz        Dalej >>

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:37:21 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:37:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/search.marc result.tmpl,NONE,1.1.2.1 search.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7488/search.marc Added Files: Tag: rel_2_0 result.tmpl search.tmpl Log Message: --- NEW FILE --- Wyniki szukania MARC
    &=&resultsperpage=&type=intranet&op=do_search> &=&resultsperpage=&type=intranet&op=do_search> &=&&resultsperpage=&type=intranet&op=do_search>
     WyÅ›wietlono od do z

      Nic nie znaleziono.
    Opis # Autor Tytuł
    ">
    &=&resultsperpage=&type=intranet&op=do_search> &=&resultsperpage=&type=intranet&op=do_search> &=&&resultsperpage=&type=intranet&op=do_search>
    --- NEW FILE --- Szukanie MARC
    ">
    		POMOC :
    Zbuduj kwerendę stosując pola i podpola MARC. "Dodaj kryteria " pozwala na dodanie innych kryteriów wyszukiwania. "Szukaj" przesyła kwerendę i wyświetla wyniki.
      value="">

    Liczba wyświetleń na stronę:
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:37:55 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:37:55 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/value_builder unimarc_field_105.tmpl,NONE,1.1.2.1 unimarc_field_60X.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7583/value_builder Added Files: Tag: rel_2_0 unimarc_field_105.tmpl unimarc_field_60X.tmpl Log Message: --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Année début ">
    Année fin ">
    --- NEW FILE --- Szukaj w tezaurusie

    Search

    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
    "> "> ">

    Wyniki

    &level=&search_string="> ')">

    Dependancies

    &level=&search_string=+"> ')">

    Dodawanie

    "> "> Create a new authority/thesaurus entry : ">
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:38:27 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:38:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/z3950 searchresult.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7705/z3950 Added Files: Tag: rel_2_0 searchresult.tmpl Log Message: --- NEW FILE --- "> Wyniki Szukania Z3950
    Znalezione Opisy
    ">
    TytuÅ‚ Autor ISBN coming from    
    )">Import this biblio
    Nothing found

    Still requests to go


    From kb2qzv at users.sourceforge.net Sun Feb 29 20:39:53 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:39:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui acqui-home.tmpl,1.1,1.1.2.1 acquire.tmpl,1.1,1.1.2.1 basket.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8009/acqui Modified Files: Tag: rel_2_0 acqui-home.tmpl acquire.tmpl basket.tmpl Log Message: Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acqui-home.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** acqui-home.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- acqui-home.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Akwizycje


    ! --- 69,98 ----
    ! SK£ADANIE ZAMÓWIENIA, ODBIÓR LUB MODYFIKACJA
    Nazwa dostawcy
    --- 1,14 ---- ! !

    Gromadzenie


    ! ! ! ! ! ! --- 41,56 ---- ! ! ! *************** *** 63,67 **** ! --- 63,67 ---- ! *************** *** 69,97 ****
    ! START, RECEIVE, MODIFY ANY ORDER
    Supplier Name *************** *** 21,29 ****
    ! ODBIÓR LUB MODYFIKACJA ZAMÓWIEÑ REGULARNYCH
    Wyszukiwanie tytu³owe --- 21,29 ----
    ! RECEIVE OR MODIFY PERIODICAL ORDER
    Szukaj wg. Tytułu *************** *** 41,56 ****
    KURSY WYMIANY
    ! ! " value=>
    EXCHANGE RATES
    ! ! " value=>
    BUD¯ET ORAZ WYDATKI KSIÊGARSKIE
    BUDGET I FUNDUSZE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Bud¿etSumaWydanoAlokowanoDostêpne
    Total

    ! Zastosuj kombinacjê klawiszy [ctrl + r] aby wy¶wietliæ uaktualnione cyfry. ! Podane cyfry s± przybli¿one, gdy¿ kurs wymiany wp³ywa na kwotê faktycznie zap³acon±.
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Budgets TotalSpentComtdAvail
    Total
    !

    ! Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid. !

    !

    POMOC zamówienia:

    !
      By rozpocz±æ akwizycjê, niezale¿nie czy jest to zamówienie, zakup w³asny czy darowizna najpierw wyszukaj dostawcê, dodaj go je¶li potrzeba.
    !
      Nastêpnie wybierz poprzedni koszyk lub utwórz nowy. Uwaga, koszyk bêdzie nale¿a³ do nazwy u¿ytkownika z jak± siê zalogowa³e¶/a¶.
    !
      Aby z³ozyæ zamówienie nale¿y ustaliæ czy istnieje ju¿ opis dla pozycji, nastêpnie albo dodaæ pozycjê albo wstawiæ nowy opis i dodaæ pozycjê.
    !

    W celu zamkniêcia koszyka kliknij na "zobacz koszyki" lub szukaj powy¿ej, a nastêpnie naci¶nij "zatwierd¼ koszyk".

    !
    ! --- 104,115 ----
    !

    HELP Ordering:

    !
      To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.
    !
      Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to
    !
      To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.
    !

    To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".

    !
    ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acquire.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** acquire.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- acquire.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,14 **** !
    ! Rachunek:
    ! Otrzymany przez:
    !
    !

    Receipt Summary for: Invoice,

    ! !

    - Odbiór zamówienia


    ! Koszyk dla: !
    Zamówienie z³o¿one:

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 25,91 ---- !

    - Przyjmij Zamówienie


    ! Shopping Basket For: !
    Order placed:

    /images/background-mem.gif" colspan=2> ! SZCZEGÓ£Y KATALOGU
    Tytu³ *" >
    Autor" >
    Data Copyright" >
    Format
    ISBN">
    Series">
    Oddzia³
    Kod kreskowy pozycji *">
    Informacje tomowe (for serials) *
    ! > ! > ! > ! "> ! "> ! "> ! ! /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> ! ! &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 93,134 ****
    /images/background-mem.gif" colspan=2> ! SZCZEGÓÅY KATALOGU
    Tytuł*" >
    Autor" >
    Copyright Date" >
    Format
    ISBN">
    Series">
    Oddział
    Item Barcode *">
    Oznaczenie tomowe (dla serii) *
    ! > ! > ! > ! "> ! "> ! "> ! ! ! ! &id=>Edytuj !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DETALE KSIÊGOWO-FINANSOWE
    Bookfund *
    Ilo¶æ zamówiona">
    Ilo¶æ odebrana *">
    Koszt wymiany">
    Budgeted Cost ">
    Faktyczny koszt *">
    Numer rachunku ! ! ">
    Uwagi">
    --- 93,134 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEGÓÅY RACHUNKU
    Bookfund *
    Quantity Ordered">
    Quantity Received *">
    Replacement Cost">
    Koszta zaplanowane ">
    Faktyczny Koszt*">
    Invoice Number ! ! ">
    Uwagi">
    *************** *** 137,141 ****

     

    !
    --- 137,141 ----

     

    !
    *************** *** 144,162 ****
    		Koszyk ISBNTYTU£ AUTORIlo¶æOtrzymano
    &biblio=&invoice=&freight=&gst=&id=>
    ! --- 144,162 ----     		Koszyk ISBNTYTUÅ AUTORQtyReceived
    &biblio=&invoice=&freight=&gst=&id=>
    ! Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/basket.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** basket.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- basket.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,55 **** ! !

    Koszyk dla >


    ! (Our Reference: , #, zatwierdzone przez: )

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! --- 1,57 ---- ! !

    Koszyk Zakupów dla >


    ! Our Reference: , # authorised by

    Zamówienie IsbnTytu³ Autor$ rrp$estIlo¶æSuma
    &id=&basket=">
    POMOC
    ! W celu zmiany informacji dotycz±cej katalogu lub zaksiêgowania danego zamówienia nalezy klikn±æ w tytu³.
    		 SubTotal
    GST
    TOTAL
    ! "> ! "> ! Dodaj zamówienie : wprowad¼ has³o lub tytu³:
    ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! *************** *** 59,61 **** ! --- 61,63 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:08 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui newbasket2.tmpl,1.2,1.2.2.1 newbasket.tmpl,1.1,1.1.2.1 newbiblio.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8103/acqui Modified Files: Tag: rel_2_0 newbasket2.tmpl newbasket.tmpl newbiblio.tmpl Log Message: Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket2.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newbasket2.tmpl 4 Oct 2003 19:47:09 -0000 1.2 --- newbasket2.tmpl 29 Feb 2004 19:40:06 -0000 1.2.2.1 *************** *** 1,20 **** ! !

    Koszyk dla:

    ! ! &basket=&sub="> ! Dodaj nowy opis ! ! &basket=&sub="> ! Dodaj nowy opis ! ! "> ! Obejrzyj koszyk
    ! > ! > ! Szukaj od nowa:
    --- 1,20 ---- ! !

    Koszyk Zakupów dla:

    ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Obejrzyj Koszyk">
    ! > ! > ! New Search:
    *************** *** 23,100 **** Szukano ! ! !
    ! znalezionych trafieñ. !
    Trafienia od do wy¶wietlone. !
    Order Publisher IsbnTytuł Autor$ rrp$estQty Total
    &id=&basket=">
    POMOC
    ! To change any of the catalogue or accounting information attached to an order, click on the title.
    		 SubTotal
    GST
    TOTAL
    ! "> ! "> ! Dodaj zamówienie: wprowadź hasło lub tytuł:
    "> ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TYTU£AUTOR©ILO¦ÆLOKALIZACJA
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! ! ! &type="> ! ! ! ! ! ! ! ! !
    !   ! !   ! !   ! !   ! !   !
    ! ! &offset=&type=&id=&basket=&search=&author="> Dalej !

    ! --- 23,100 ---- Szukano ! ! !
    ! znalezionych rekordów. !
    Wyświetlono od do rekordu. ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TYTUÅAUTOR©ILOŚĆLOCATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! ! ! &type="> ! ! ! ! ! ! ! ! !
    !   ! !   ! !   ! !   ! !   !
    ! ! &offset=&type=&id=&basket=&search=&author="> Dalej ! ! Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** newbasket.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- newbasket.tmpl 29 Feb 2004 19:40:06 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Koszyk dla


    ! (Our Reference: , #, zatwierdzone przez: )
    ! Tel: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Wyszukaj has³o lub tytu³:
    --- 1,14 ---- ! !

    Koszyk Zakupów dla


    ! (Our Reference: , #, authorised by: )
    ! Ph: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Szukaj wg. Słowa Kluczowego lub Tytułu:
    *************** *** 16,36 **** ! ! ! ! ! > ! ! ! ! ! !
    Zamówienie IsbnTytu³ AutorIlo¶æ
    ! --- 16,36 ---- ! ! ! ! ! > ! ! ! ! ! !
    Order IsbnTytuł AutorQty
    ! Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbiblio.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** newbiblio.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- newbiblio.tmpl 29 Feb 2004 19:40:06 -0000 1.1.2.1 *************** *** 1,3 **** !
    ! ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Obejrzyj koszyk !

    - Szczegó³y zamówienia


    ! Koszyk dla:

    ! ! ! ! ! ! ! ! ! ! ! !
    SZCZEGÓ£Y KATALOGU
    TYTU£ *">
    Autor" >
    Data Copyright">
    Format
    ISBN">
    Series">
    Oddzia³
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! --- 51,137 ---- ! ! --> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Przejrzyj Koszyk

    - Szczegóły Zamówienia


    ! Shopping Basket For:

    DETALE KSIÊGOWO-FINANSOWE
    Ilo¶æ" onchange='update(this.form)' >
    Bookfund
    Cena dostawcy" onchange='update(this.form)'>
    Koszt wymiany
    		" onchange='update(this.form)'>
    Budgeted Cost
    (ex GST, inc discount)     		" onchange='update(this.form)'>
    Budgeted GST
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEGÓÅY KATALOGU
    Tytuł*">
    Autor" >
    Publisher" >
    Copyright Date">
    Typ pozycji
    ISBN">
    Series">
    Oddział
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! *************** *** 138,153 **** ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEGÓÅY RACHUNKU
    Quantity" onchange='update(this.form)' >
    Bookfund
    Suppliers List Price" onchange='update(this.form)'>
    Replacement Cost
    		" onchange='update(this.form)'>
    Koszta zaplanowane
    (bez VAT, z rabatem)     		" onchange='update(this.form)'>
    Zaplanowany VAT
    Koszt faktyczny
    Numer rachunku *
    Uwagi">
    //images/2rightarrow.png" border=0 align=right>
    --- 141,157 ----
    Faktyczny Koszt
    Invoice Number *
    Uwagi">
    !
    *************** *** 155,166 **** !
    HELP
      !
    • T³uste pola s± obowiazkowe dla stworzenia nowego opisu i pozycji.

      !

    • Zacienione pola mog± byæ u¿yte w celu "szybkiego" odbioru zamówienia, gdy pozycje by³y kupione lokalnie lub darowane. W tym wypadku ilo¶æ "zamówiona" zostanie wprowadzona do bazy jako ilo¶æ otrzymana.

     

    ! --- 159,170 ---- !
    /images/background-mem.gif">POMOC
      !
    • TÅ‚uste pola muszÄ… być wypeÅ‚nione, aby utworzyć nowy opis i egzemplarz.

      !

    • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.

     

    ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui order.tmpl,1.1,1.1.2.1 recieveorder.tmpl,1.1,1.1.2.1 recieve.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8161/acqui Modified Files: Tag: rel_2_0 order.tmpl recieveorder.tmpl recieve.tmpl Log Message: Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/order.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** order.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- order.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,18 **** ! !

    Wyniki wyszukiwania dostawców


    ! Szukano dostawcy , znaleziono rezultat(y)(ów)

    ! ! ! ! ! > ! !
    ZamówOdbierzPodmiot ! ! !
    KoszykPozycjePracownikData
    --- 1,18 ---- ! !

    Wyniki Szukania Dostawców


    ! You searched on supplier , results found

    ! ! ! ! ! > ! !
    OrderReceiveCompany ! ! !
    KoszykItemsStaffDate
    *************** *** 20,48 ****
    ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > ! ! ! ! !
    ">


    ! Dodaj dostawcê ! --- 20,52 ----
    ! ! /images/mail_send.png" title="Dodaj zamówienie" alt="Dodaj" border=0> ! ! Inactive ! ! /images/mail_get.png" title="receive" alt="Dodaj" border=0> ! ! ! ! !
    ">


    ! Dodaj dostawcÄ™ ! Index: recieveorder.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieveorder.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** recieveorder.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- recieveorder.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Odbiór zamówieñ od dostawcy ">

    ! >

    ! ! --- 1,14 ---- ! !

    Przyjmij Zamówienia od Dostawcy ">

    ! >

    INFORMACJE O RACHUNKU DOSTAWCY
    Numer rachunku dostawcy
    ! ! *************** *** 20,29 **** ! ! --- 20,29 ---- ! ! *************** *** 31,33 **** ! --- 31,33 ---- ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieve.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** recieve.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- recieve.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,19 **** !
    ! Rachunek:
    ! Otrzymany przez:
    !
    !

    Receipt Summary for : , Rachunek

    ! "> ! "> ! "> ! "> ! Szukaj ISBN lub tytu³:

    --- 1,19 ---- !

    ! Invoice:
    ! Received By:
    !
    !

    Receipt Summary for : Faktura

    ! "> ! "> ! "> ! "> ! Szukaj wg. ISBN lub Tytułu:

    *************** *** 24,47 ****

    ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! --- 53,60 ---- ! ! ! ! *************** *** 63,74 ****
    The total at the bottom of the page should be within a few cents of the total for the invoice.

    ! When you have finished this invoice save the changes.

    ! !
    SUPPLIER INVOICE INFORMATION
    Supplier Invoice Number
    Za przesy³kê
    /images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
    Freight
    KOSZYK ISBNTYTU£ AUTORFAKTYCZNY P&PILSUMA
    &biblio=&invoice=&gst=&freight=&id=">$ $
    --- 24,47 ----     		KOSZYK ISBNTYTUÅ AUTORACTUAL P&PQTYTOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    *************** *** 53,60 ****     		SUBTOTALS$$
    SUBTOTALS$$
    GST$
    TOTAL$
    --- 63,74 ----
    The total at the bottom of the page should be within a few cents of the total for the invoice.

    ! Po skończeniu faktury zapisz zmiany.

    		GST$
    TOTAL$
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:43 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui supplier.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8230/acqui Modified Files: Tag: rel_2_0 supplier.tmpl Log Message: Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/supplier.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** supplier.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- supplier.tmpl 29 Feb 2004 19:40:41 -0000 1.1.2.1 *************** *** 1,13 **** !
    ! > ! !

    Uaktualnienie:

    ! !

    Dodaj dostawcê

    !

    --- 1,13 ---- ! ! > ! !

    Update:

    ! !

    Dodaj dostawcÄ™

    !

    *************** *** 15,108 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - - -
    Szczegó³y podmiotu
    Nazwa podmiotu">
    Adres pocztowy !
    Adres fizyczny
    Telefon">
    Fax">
    Witryna">
    Dane kontaktowe
    Nazwisko">
    Stanowisko">
    Telefon">
    Inny telefon">
    Fax">
    E-mail">
    Uwagi
    /images/filesave.png" border=0 title="save" alt="save">
    ! ! ! ! ! --- 15,109 ----
    BIE¯¡CY STATUS
    Dostawca jestchecked>Active ! checked>Inactive
    DANE O ZAMÓWIENIACH
    Publishers and Imprints
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DANE O FIRMIE
    Company Name">
    Adres Pocztowy !
    Adres Zamieszkania
    Telefon">
    Fax">
    Witryna">
    DANE KONTAKTOWE
    Contact Name">
    Position">
    Telefon">
    Inny Telefon">
    Fax">
    E-mail">
    Uwagi
    ! ! ! ! ! Active Inactive ! ! ! *************** *** 111,117 **** --- 112,118 ---- *************** *** 121,127 **** --- 122,128 ---- *************** *** 130,135 **** --- 131,135 ---- *************** *** 137,142 **** --- 137,141 ---- *************** *** 144,160 **** ! !
    STATUS BIEŻĄCY
    Supplier is ! ! Active Inactive
    ORDERING INFORMATION
    Publishers and Imprints
    GST Registered ! checked>Yes ! checked>No
    GST Registered ! checked>Tak checked>Nie
    List Item Price Includes GST ! checked>Yes ! checked>No
    List Item Price Includes GST ! checked>Tak checked>Nie
    Invoice Item Price Includes GST ! checked>Yes ! checked>No
    Rabat> %
    !

    ! --- 143,159 ----
    		Invoice Item Price Includes GST ! checked>Tak checked>Nie
    Discount> %
    !
    !
    /images/filesave.png" border=0 title="Zapisz" alt="Zapisz" class="button"> ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple addbooks.tmpl,1.3,1.3.2.1 additem-nomarc.tmpl,1.1,1.1.2.1 additem.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8284/acqui.simple Modified Files: Tag: rel_2_0 addbooks.tmpl additem-nomarc.tmpl additem.tmpl Log Message: Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/addbooks.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** addbooks.tmpl 4 Oct 2003 20:45:12 -0000 1.3 --- addbooks.tmpl 29 Feb 2004 19:40:55 -0000 1.3.2.1 *************** *** 1,39 **** ! ! Zarz±dzanie opisem MARC !

    ! Nic nie znaleziono ! !

    ! Dodano opis bibliograficzny witryny !

    !
    Zeskanuj lub wpisz numer ISBN/ISSN, aby dodaæ nowy opis/pozycjê:

    ! ! ! ! ! ! ! ! ! ! ! ! !
    ISBN:Je¶li tytu³ lub ISBN zostanie odnaleziony w tablicach opisów, zostanie przywo³any i bêdzie mo¿na go modyfikowaæ.
    ! Je¶li tytu³ lub ISBN zostanie znaleziony w "przechowalni opisów", zostanie przywo³any a opis zostanie dodany.
    ! W przeciwnym razie opis mo¿na utworzyæ od podstaw.
    Tytu³
     Utwórz pusty opis
    Utwórz pusty opis
    --- 1,39 ---- ! ! ZarzÄ…dzanie Opisem MARC !

    ! No items found ! !

    ! Dodano WitrynÄ™ Biblioitem !

    !
    Zeskanuj lub wpisz numer ISBN/ISSN aby dodać nowy opis/egzemplarz

    ! ! ! ! ! ! ! ! ! ! ! ! !
    ISBN:Po odnalezieniu i wyświetleniu numeru ISBN lub tytułu z bazy opisów, bedzie można dokonać modyfikacji.
    ! Jeśli ISBN lub tytuł zostaną odnalezione w rezerwuarze opisów to zostanie on wyswietlony i opis zostanie dodany.
    ! W przeciwnym razie, opis można dodać od podstaw.
    Tytuł
     Wprowadź od podstaw
    Wprowadź od podstaw
    *************** *** 44,48 **** !
    Dodaj now± witrynê
    --- 44,48 ---- !
    Dodaj NowÄ… WitrynÄ™
    *************** *** 50,59 **** ! !
    Has³o:

    ! --- 50,59 ---- ! !
    Keyword:

    ! Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem-nomarc.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** additem-nomarc.tmpl 5 Oct 2003 19:20:42 -0000 1.1 --- additem-nomarc.tmpl 29 Feb 2004 19:40:55 -0000 1.1.2.1 *************** *** 1,64 **** ! test !

    ! ! Musisz nadaæ pozycji kod kreskowy

    ! ! ! Musisz otworzyæ now± grupê, do której dodana zostanie pozycja

    ! ! ! Niestety, ten kod jest ju¿ w u¿yciu

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    REKORD BIBLIOGRAFICZNY
    Autor:
    ! Copyright:
    ! Tytu³ serii:
    ! Uwagi:
    GRUPA - !
    URL:
    ! Data:
    ! Uwagi:
    ! ! GRUPA -
    ISBN:
    ! Dewey:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    Pozycja:
    ! Odzia³ w³asny:
    ! Uwagi:
    --- 1,62 ---- ! test !

    ! ! You must give the item a barcode

    ! ! ! You must create a new group for your item to be ! added to

    ! ! ! Sorry, that barcode is already in use

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    WIERSZ OPISU
    Autor:
    ! Copyright:
    ! Tytuł Serii:
    ! Uwagi:
    GRUPA -
    URL:
    ! Data:
    ! Uwagi:
    GRUPA -
    ISBN:
    ! Dewey:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    Egzemplarz:
    ! Oddział Właściwy:
    ! Uwagi:
    *************** *** 67,90 ****

    ! "> ! ! ! ! --- 65,88 ---- ! ">
    DODAJ NOW¡ POZYCJÊ:
    ! Dla witryny dodaj tylko grupê
    Kod kreskowy pozycji:
    Oddzia³:
    Cena wymiany:
    ! ! ! ! *************** *** 94,126 **** ! ! ! ! --- 92,123 ---- ! ! ! ! *************** *** 130,150 **** ! ! ! ! ! --- 127,147 ---- ! ! ! ! ! *************** *** 154,158 **** ! --- 151,155 ---- ! *************** *** 171,175 **** ! --- 168,172 ---- ! *************** *** 178,194 **** ! ! ! ! --- 175,191 ---- ! ! ! ! *************** *** 198,203 **** !
    DODAJ NOWY EGZEMPLARZ:
    ! For a website add the group only
    Kod paskowy pozycji:
    Oddział:
    Cana Wymiany:
    Dodaj do istniej±cej grupy:
    Grupa:
    LUB dodaj do nowej grupy:
    Format:
    Dodaj do istniejÄ…cej grupy:
    Group:
    LUB Dodaj do nowej Grupy:
    Format:
    Wydawca:
    Rok publikacji:
    Miejsce publikacji:
    Ilustrator:
    Dodatkowi autorzy:
    Ka¿dy autor w osobnej linii
    Publisher:
    Publication Year:
    Place of Publication:
    Illustrator:
    Dodatkowi Autorzy:
    One Author per line
    Witryna URL:
    URL Witryny
    LCCN:
    LCCN:
    Numer:
    Volume Description:
    Strony:
    Wymiary:
    Number:
    Opis Tomu:
    Pages:
    Size:
    --- 195,199 ----
    *************** *** 205,207 **** ! --- 201,203 ---- ! Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** additem.tmpl 4 Oct 2003 20:45:12 -0000 1.2 --- additem.tmpl 29 Feb 2004 19:40:55 -0000 1.2.2.1 *************** *** 1,3 **** ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,129 ---- ! ! ! ! ZAPRASZAMY DO ADMINISTRACJI SYSTEMU ! ! ! ! ! ! ! !
    !
    ! Koha: Horowhenua Library Trust    		 ! !
    !
    ! Wprowad¼ wyra¿enie i naci¶nij klawisz enter.
    ! ! ! -Wyszukiwanie zaawansowane (wiêcej opcji)
    !
    !
    ! !
    ! !
    ! Wprowad¼ wyra¿enie i naci¶nij kalwisz enter.
    !

    !
    ! ! ! ! --- 7,11 ---- ! *************** *** 13,19 **** --- 13,19 ---- *************** *** 21,60 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 152,187 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 131,159 ---- ! ! ! ! ! ! ! ! ! + + + + ! ! ! ! *************** *** 190,194 ****
    /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
    /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Szukaj w katalogu" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
    ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">    		   ! ! !
    ! Wpisz szukane słowo i naciśnij klawisz enter.
    ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Szukanie Zaawansowane (Więcej Opcji)
    ! ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
      ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Wyszukiwanie Czytelników" name="member" hspace="0" vspace="0" border="0">
      
    ! !
    ! Wpisz szukane słowo i naciśnij klawisz enter.
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
         /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Gromadzenie" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >

    !

    !
         /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Rachunki i Raporty" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Parametry" border="0">
    + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
      /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Cyrkulacja" hspace="0" vspace="0" border="0">
    - --- 162,165 ---- Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/mancredit.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** mancredit.tmpl 4 Oct 2003 09:21:00 -0000 1.3 --- mancredit.tmpl 29 Feb 2004 19:46:59 -0000 1.3.2.1 *************** *** 1,22 **** ! !

    Kredyt rêczny

    ! "> ! ! ! ! !
    Numer czytelnika
    Typ
    Numer pozycji
    Opis
    Ilo¶æ
    ! --- 1,22 ---- ! !

    Manual Credit

    ! "> ! ! ! ! !
    Borrowernumber
    Typ
    Itemnumber
    Wyjaśnienie
    Kwota
    ! \ No newline at end of file Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/maninvoice.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** maninvoice.tmpl 4 Oct 2003 09:21:00 -0000 1.2 --- maninvoice.tmpl 29 Feb 2004 19:46:59 -0000 1.2.2.1 *************** *** 1,25 **** ! !

    Rachunek rêczny

    ! "> ! ! ! !
    Numer czytelnika
    Typ
    Numer pozycji
    Opis
    Kwota
    ! \ No newline at end of file --- 1,25 ---- ! !

    Manual Invoice

    ! "> ! ! ! !
    Borrowernumber
    Typ
    Itemnumber
    Wyjaśnienie
    Kwota
    ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:14 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl member-flags.tmpl,1.1,1.1.2.1 modbibitem.tmpl,1.3,1.3.2.1 modbib.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9875 Modified Files: Tag: rel_2_0 member-flags.tmpl modbibitem.tmpl modbib.tmpl Log Message: Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/member-flags.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** member-flags.tmpl 4 Oct 2003 09:25:44 -0000 1.1 --- member-flags.tmpl 29 Feb 2004 19:47:11 -0000 1.1.2.1 *************** *** 1,28 **** ! !

    ,

    ! > ! !
    FLAGI
    ! > ! !

    !

    ! --- 1,28 ---- ! !

    ,

    ! > ! !
    FLAGI
    ! > ! !

    !

    ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbibitem.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** modbibitem.tmpl 4 Oct 2003 09:52:36 -0000 1.3 --- modbibitem.tmpl 29 Feb 2004 19:47:11 -0000 1.3.2.1 *************** *** 1,5 **** ! !

    "&type=intra> ()
    ! Modyfikuj Grupê -


    --- 1,5 ---- ! !

    "&type=intra> ()
    ! Modify Group -


    *************** *** 7,11 ****
    PRZYPISZ DO ISTNIEJ¡CEJ GRUPY
    RE-ASSIGN TO EXISTING GROUP
    LUB ZMIEÑ SZCZEGÓ£Y
    Typ pozycji" size=20>
    URL" size="20">
    Klasa" size=20>
    Wydawca" size=20>
    Miejsce" size=20>
    ISBN" size=20>
    Rok publikacji" size=20>
    Strony" size=20>
    Ilustracje" size=20>
    Tom" size=20>
    Notatki">
    Wymiary" size=20>
    --- 21,60 ----
    LUB EDYTUJ SZCZEGÓÅY
    Typ pozycji" size=20>
    URL" size="20">
    Typ pozycji" size=20>
    Publisher" size=20>
    Place" size=20>
    ISBN" size=20>
    Publication Year" size=20>
    Pages" size=20>
    Illustrations" size=20>
    Tom" size=20>
    Uwagi">
    Size" size=20>
    *************** *** 68,92 ****
    ZMIANY MAJ¡CE DOTYCZYÆ TYCH KODÓW KRESKOWYCH
    ! Zaznacz TE kody kreskowe, których zmiany maj± dotyczyæ. Wszystkie nie-zaznaczone zachowaj± swoj± oryginaln± grupê.
     Kod kreskowyLokalizacjaTermin zwrotuOdprawiono
    ">"&bib=""&bi=""">

    --- 68,92 ---- ! ZMIANY DOTYCZĄCE TYCH KODÓW
    ! Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.   ! Kod Paskowy ! Location ! Date Due ! Ostatnio rejestrowana ! ! "> ! &bib=&bi="> ! ! !

    *************** *** 99,106 **** ! POMOC: Musisz klikn±æ w ¿±dane kó³ko wyboru (na zielonym tle), nastêpnie albo przypisaæ pozycjê/e do istniej±cego ju¿ w systemie rekordu, ! albo zmodyfikowaæ ten rekord. JE¦LI zmiany maj± dotyczyæ jedynie niektórych pozycji, zaznacz je odpowiednio, wówczas utworzony zostanie dla nich automatycznie osobny rekord grupowy.

     

    ! --- 99,105 ---- ! HELP Należy kliknąć na odpowiedni guzik (w zielonym prostokącie) i wybrać albo przypisanie do istniejącej grupy albo modyfikację rekordu. Jeśli zmiany mają dotyczyć tylko niektórych rekordów, należy zaznaczyć je odpowiednio; stworzy to automatycznie nowy grupowy rekord.

     

    ! Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbib.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** modbib.tmpl 4 Oct 2003 09:34:15 -0000 1.2 --- modbib.tmpl 29 Feb 2004 19:47:11 -0000 1.2.2.1 *************** *** 1,57 **** ! ! ">Zmieñ dowi±zania stron ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Autor">
    Tytu³">
    Abstrakt
    Przedmiot
    Data Copyright'u">
    Tytu³ Serii">
    Autor dodatkowy">
    Podtytu³">
    Ujednolicony">
    Notatki
    Seria">

    ! ! --- 61,63 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl moditem.tmpl,1.4,1.4.2.1 modwebsites.tmpl,1.2,1.2.2.1 newimember.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9918 Modified Files: Tag: rel_2_0 moditem.tmpl modwebsites.tmpl newimember.tmpl Log Message: Index: moditem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/moditem.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** moditem.tmpl 4 Oct 2003 09:59:49 -0000 1.4 --- moditem.tmpl 29 Feb 2004 19:47:26 -0000 1.4.2.1 *************** *** 1,42 **** ! !

    ()


    --- 1,36 ---- ! !

    ()


    ! ! "> ! "> ! "> ! "> ! "> ! "> ! ! "> ! ! ! ! ! "> ! "> ! ">
    Kod kreskowy" size=40>
    Uwagi o pozycji
    Oddzia³ w³a¶ciwy" size=40>
    Zagubiona ! checked > ! Yes ! checked > ! No
    Cancelled checked > ! Yes ! checked > ! No
    ! //images/filesave.png border=0>
    *************** *** 44,46 **** ! \ No newline at end of file --- 38,40 ---- ! Index: modwebsites.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modwebsites.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** modwebsites.tmpl 4 Oct 2003 10:03:03 -0000 1.2 --- modwebsites.tmpl 29 Feb 2004 19:47:26 -0000 1.2.2.1 *************** *** 1,41 **** !

    ! ">Powrót do strony szczegó³ów !

    ! "> ! ">

    ! ! "> ! "> ! "> ! "> ! "> ! "> ! ! "> ! ! ! ! ! "> ! "> ! ">
    Kod Paskowy" size=40>
    ItemNotes
    Oddział Właściwy" size=40>
    Lost ! checked > Yes checked > No
    Anulowano checked > Yes checked > No
    ! //images/filesave.png border=0>
    ! ! ! ! !
    Tytu³">
    Opis
    URL">
    ! !

    !

    Dodaj nastêpn± stronê www

    ! "> ! ! --- 1,41 ---- !

    ! ">Return to Details Page !

    ! "> ! ">

    Tytu³
    Opis
    ! ! ! ! !
    Tytuł">
    Wyjaśnienie
    URL">
    !
    !

    !

    Dodaj nowy link witryny

    ! "> ! ! *************** *** 45,51 ****
    Tytuł
    Wyjaśnienie
    !
    ! --- 45,51 ---- ! ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newimember.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** newimember.tmpl 4 Oct 2003 10:07:48 -0000 1.3 --- newimember.tmpl 29 Feb 2004 19:47:26 -0000 1.3.2.1 *************** *** 1,19 **** ! ! ! ! ! ! Niewa¿ny numer karty.

    ! ! Warto¶ci zgodne. Kliknij OK, by potwierdziæ nowego czytelnika

    ! ! " value=""> !
    !     !     ! --- 1,180 ---- ! ! ! ! ! ! Invalid cardnumber.

    ! !

    Potwierdź Wpis

    ! ! " > ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! !
    /images/background-mem.gif"> ! NOWY CZYTELNIK !
    ! ImiÄ™ i Nazwisko ! ! !
    /images/background-mem.gif"> ! DANE CZÅONKOWSKIE !
    ! Numer Członkowski ! ! !
    ! Numer karty ! ! !
    ! Oddział Zapisu ! ! !
    /images/background-mem.gif"> ! ADRES CZYTELNIKA !
    ! Adres Pocztowy ! ! !
    ! Adres Domowy ! ! !
    /images/background-mem.gif"> ! SZCZEGÓÅY DANYCH KONTAKTOWYCH !
    ! Telefon (Dom) ! ! !
    ! Telefon (Praca) ! ! !
    ! Fax ! ! !
    ! E-mail ! ! !
    ! Komunikatory ! ! !
    /images/background-mem.gif"> ! POÅšREDNI RODZAJ KONTAKTU !
    ! ImiÄ™ i Nazwisko ! ! !
    ! Telefon ! ! !
    ! Relacja ! ! !
    ! Uwagi ! ! !
    /images/background-mem.gif"> ! UWAGI !
    ! Uwagi Ogólne ! ! !

    ! Prawidłowe wartości. Naciśnij OK by potwierdzić tego nowego czytelnika

    ! ! " value=""> !
    ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:55 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:55 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl overdue.tmpl,1.2,1.2.2.1 reports.tmpl,1.1,1.1.2.1 request.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9986 Modified Files: Tag: rel_2_0 overdue.tmpl reports.tmpl request.tmpl Log Message: Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/overdue.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** overdue.tmpl 4 Oct 2003 12:58:40 -0000 1.2 --- overdue.tmpl 29 Feb 2004 19:47:52 -0000 1.2.2.1 *************** *** 1,32 **** ! !

    Pozycje zaleg³e w dniu


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Termin zwrotuKlientTel.Tytu³ Autor
    ?subject=Overdue: ">
    ! --- 1,32 ---- ! !

    Zaległe pozycje do dnia


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Do ZwrotuPatronTelefonTytuł Autor
    ?subject=Overdue: ">
    ! Index: reports.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** reports.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- reports.tmpl 29 Feb 2004 19:47:52 -0000 1.1.2.1 *************** *** 1,8 **** ! !

    raporty

    ! ! ! ! --- 1,8 ---- ! !

    reportów

    ! ! ! ! Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/request.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** request.tmpl 4 Oct 2003 12:53:07 -0000 1.1 --- request.tmpl 29 Feb 2004 19:47:52 -0000 1.1.2.1 *************** *** 1,12 **** !
    ! /images/place-request.gif" align=right > ! "> ! "> !

    Zamawienie: ! > !

    --- 1,9 ---- ! ! "> ! "> !

    Zamówienie: >

    *************** *** 14,23 **** ! ! ! ! ! ! --- 11,20 ----
    /images/background-mem.gif">Ranga/images/background-mem.gif">Numer Cz³onka/images/background-mem.gif">Uwagi/images/background-mem.gif">Data/images/background-mem.gif">Odbiór/images/background-mem.gif">Zamówienie
    ! ! ! ! ! ! *************** *** 25,85 **** ! !
    /images/background-mem.gif">Rank/images/background-mem.gif">Member Number/images/background-mem.gif">Uwagi/images/background-mem.gif">Date/images/background-mem.gif">Pickup/images/background-mem.gif">Request
    ! Kolejna dostêpna,
    (lub wybierz z listy poni¿ej)
    ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Zamówienie/images/background-mem.gif">Typ pozycji/images/background-mem.gif">Klasyfikacja/images/background-mem.gif">Tom/images/background-mem.gif">Data publikacji/images/background-mem.gif">Egzemplarze
    ! ! Nie mo¿e byæ wybrana ! ! > ! > ! ! ! ! ! ! !
    !
    --- 22,82 ---- ! ! ! Next Available, or choose from list below ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Request/images/background-mem.gif">Typ pozycji/images/background-mem.gif">Classification/images/background-mem.gif">Tom/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! Cannot be selected ! ! > ! > ! ! ! ! ! ! !
    !
    *************** *** 89,161 **** ! action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODYFIKUJ ISTNIEJ¡CE ZAMÓWIENIA
    /images/background-mem.gif">Ranga/images/background-mem.gif">Cz³onek/images/background-mem.gif">Uwagi/images/background-mem.gif">Data/images/background-mem.gif">Odbiór/images/background-mem.gif">Zamówienie
    ! > ! > ! > ! Oczekuj±ca pozycja w > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Kolejna dostêpna ! ! ! Tylko ten typ : ! ! !
    ! Wyma¿ rezerwacjê wybieraj±c "del" z listy ranga. ! //images/2rightarrow.png">
    --- 86,159 ---- ! action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODIFY EXISTING REQUESTS
    /images/background-mem.gif">Rank/images/background-mem.gif">Member/images/background-mem.gif">Uwagi/images/background-mem.gif">Date/images/background-mem.gif">Pickup/images/background-mem.gif">Request
    ! > ! > ! > ! Item waiting at > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Next Available ! ! ! This type only : ! ! !
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> !
    *************** *** 164,166 ****

    ! --- 162,164 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:42 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newjmember.tmpl,1.2,1.2.2.1 newmember.tmpl,1.2,1.2.2.1 opac-main.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954 Modified Files: Tag: rel_2_0 newjmember.tmpl newmember.tmpl opac-main.tmpl Log Message: Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newjmember.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newjmember.tmpl 4 Oct 2003 10:10:43 -0000 1.2 --- newjmember.tmpl 29 Feb 2004 19:47:40 -0000 1.2.2.1 *************** *** 1,13 **** ! ! ! ! !

    'Potwierd¼ Wpis'

    ! ! ! " > ! --- 1,13 ---- ! ! ! ! !

    Potwierdź Wpis

    ! !
    "> NOWY CZYTELNIK
    ! " > ! *************** *** 18,30 **** ! " > ! ! " > ! --- 34,41 ---- *************** *** 45,85 ****
    "> NOWY CZYTELNIK
    ! NAZWISKO !
    "> ! SZCZEGÓ£Y CZ£ONKOWSKIE --- 18,30 ----
    ! ImiÄ™ i Nazwisko !
    "> ! DANE CZÅONKOWSKIE *************** *** 34,41 ****
    ! Numer Czytelnika !
    ! Numer Członkowski !
    !
    ! P³eæ !
    ! Szko³a !
    ! Uwagi ogólne !

    ! !

    ! ! " value=""> ! !
    !     ! --- 45,85 ---- ! ! Płeć ! ! Szkoła ! ! Uwagi Ogólne !

    ! !

    ! ! " value=""> ! !
    ! ! Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newmember.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newmember.tmpl 4 Oct 2003 12:58:40 -0000 1.2 --- newmember.tmpl 29 Feb 2004 19:47:40 -0000 1.2.2.1 *************** *** 1,55 **** ! ! !

    Potwierd¼ Wpis

    ! " > ! ! " > ! --- 1,55 ---- ! ! !

    Potwierdź Wpis

    /images/background-mem.gif"> ! NOWY CZ£ONEK
    ! Nazwisko !
    /images/background-mem.gif"> ! SZCZEGÓ£Y CZ£ONKOWSKIE
    ! Numer czytelnika !
    ! Numer Karty !
    ! Kategoria cz³onkowstwa !
    ! Op³ata !
    ! " > ! ! " > ! *************** *** 59,84 **** ! " > ! --- 59,84 ---- ! " > ! *************** *** 88,104 **** ! " > ! --- 88,108 ---- ! " > ! *************** *** 106,142 **** ! " > ! --- 110,146 ---- ! " > ! *************** *** 146,150 **** --- 150,154 ---- *************** *** 154,195 **** ! " > ! --- 158,199 ---- ! " > ! *************** *** 199,251 **** ! " > !
    /images/background-mem.gif"> ! NOWY CZYTELNIK
    ! ImiÄ™ i Nazwisko !
    /images/background-mem.gif"> ! DANE CZÅONKOWSKIE
    ! Numer Członkowski !
    ! Numer karty !
    ! Kategoria Członkowska !
    ! Opłata !
    !
    ! Termin wyga¶niêcia !
    ! Oddzia³ zapisu !
    /images/background-mem.gif"> ! DANE PERSONALNE
    !
    ! Data wygaśnięcia !
    ! Oddział Zapisu !
    /images/background-mem.gif"> ! DANE OSOBISTE
    !
    ! P³eæ !
    /images/background-mem.gif"> ADRES CZYTELNIKA !
    ! Płeć ! ! Mężczyzna ! ! Kobieta !
    /images/background-mem.gif"> ADRES CZYTELNIKA
    ! Adres pocztowy !
    ! Adres domowy !
    /images/background-mem.gif"> ! DANE OSOBY KONTAKTOWEJ
    ! Tel. (Domowy) !
    ! Tel. (W pracy) !
    ! Adres Pocztowy !
    ! Adres Domowy !
    /images/background-mem.gif"> ! SZCZEGÓÅY DANYCH KONTAKTOWYCH
    ! Tel. domowy !
    ! Tel. praca !
    !
    !
    !
    ! Text messaging !
    /images/background-mem.gif"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ
    ! Nazwisko !
    ! Tel. !
    ! Pokrewieñstwo !
    !
    ! Komunikatory !
    /images/background-mem.gif"> ! POÅšREDNI RODZAJ KONTAKTU
    ! ImiÄ™ i Nazwisko !
    ! Telefon !
    ! Relacja !
    !
    /images/background-mem.gif"> ! NOTATKI
    ! Uwagi ogólne !

    ! ! " value=""> ! !
    ! !

    B£¡D

    !

    Nastêpuj±ce pola s± ¼le wype³nione. Wróæ do poprzedniej strony i spróbuj raz jeszcze:

    ! ! Cardnumber
    !     ! ! Invalid_cardnumber
    !     ! ! Gender
    !     ! ! Given Names
    !     ! ! Surname
    !     ! ! Postal Street Address
    !     ! ! Postal city
    !     !     ! --- 203,255 ---- ! ! " > ! /images/background-mem.gif"> ! UWAGI ! Uwagi Ogólne !

    ! ! " value=""> ! !
    ! !

    BÅÄ„D

    !

    Następujące pola mają niewłaściwe wartości. Nacisnij przycisk wstecz i popraw:

    ! ! Numer karty
    ! ! ! Nie prawidłowy numer karty
    ! ! ! Płeć
    ! ! ! Imiona
    ! ! ! Nazwisko
    ! ! ! Ulica Adresu Pocztowego
    ! ! ! Miasto
    ! ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-main.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- opac-main.tmpl 29 Feb 2004 19:47:40 -0000 1.3.2.1 *************** *** 1,269 **** ! ! ! WITAMY W KATALOGU KOHA ! ! ! - - - - - - -
    - ! ! ! ! ! - -
    ! ! ! ! ! ! ! ! ! ! ! ! ! - - - - ! ! ! ! - - - - - - - - - - - - - - -

    - Koha: Katalog i us³ugi dla czytelników    		Szukaj w katalogu
       
    - -
    - ! ! Wprowad¼ wyra¿enie i naci¶nij klawisz enter.
    ! - - -Wyszukiwanie zaawansowane (wiêcej opcji)
    ! ! -

    ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! ! ! !

    Zaloguj siê do Koha

    ! ! !
    - -
    -

    -

    - --- 1,134 ---- ! ZAPRASZAMY DO KATALOGU OPAC
    ! !
    ! ! ! ! ! !

    Koha: Horowhenua Library Trust Catalogue and Member Services    		 Search the Catalogue
       

    ! Wpisz szukane słowo i naciśnij klawisz enter.
    -Szukanie Zaawansowane (Więcej Opcji)

    ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Log In to Koha

    !

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:48:07 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:48:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl reservereport.tmpl,1.1,1.1.2.1 searchheader.tmpl,1.1,1.1.2.1 shelves.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10067 Modified Files: Tag: rel_2_0 reservereport.tmpl searchheader.tmpl shelves.tmpl Log Message: Index: reservereport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reservereport.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** reservereport.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- reservereport.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,25 **** !
    ! ! --- 1,25 ---- !
    ! ! ! !
    !     
    ! ! *************** *** 27,29 ****
    ! ! ! !
    !     
    ! --- 27,29 ---- ! Index: searchheader.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/searchheader.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** searchheader.tmpl 9 Jan 2003 10:08:17 -0000 1.1 --- searchheader.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,2 **** ! >Results with dewey | >Results with biblionumber
    --- 1,2 ---- ! >Results with dewey | >Results with biblionumber
    Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/shelves.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** shelves.tmpl 9 Jan 2003 10:08:17 -0000 1.1 --- shelves.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,102 **** ! !

    Zalogowano jako: [Wyloguj]

    ! ! ! !
    !
    ! Lista pó³ek

    ! ! ! ! ! ! ! ! ! ! ! !
    ! ! !
    Dodaj ksi±¿kê wed³ug kodu kreskowego:
    !
    ! ! !
    "> ! Zawarto¶æ pó³ki shelf !
    !
    ">">" width=10 align=center>">" width=10 align=center>">" width=10 align=center>">
    !
    ! "> ! ! "> ! !

    ! ! ! !

    ! ! ! !

    ! !

    ! Modyfikuj zawarto¶æ pó³ki

    !

    Pó³ki z ksi±¿kami

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Wybierz pó³ki do wymazania !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Dodaj pó³kê:

    !

    ! !

    !
    ! ! ! !
    "> ! ! !
    "> ! Lista pó³ek !
    !
    "> ! "> ! ( ksi±¿ki) !
    !

    Dodaj lub usuñ pó³ki ! ! ! ! ! --- 1,139 ---- ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Contents of !
    ">">">">">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Dodaj książkę wg. kodu paskowego w ! ! ! ! "> ! !
    !
    ! ! ! !

    ! ! ! !

    ! !

    !

    Półki

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( książek) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Dodaj Półkę !
    !

    !
    !

    !
    !
    !
    ! ! ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> ! "> ! ( ksiÄ…zek) !
    !

    ! Dodaj lub Usuń Półki Wirtualne !

    ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:48:20 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:48:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl stats.tmpl,1.1,1.1.2.1 thesaurus_popup.tmpl,1.3,1.3.2.1 updatebiblio.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10118 Modified Files: Tag: rel_2_0 stats.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: Index: stats.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/stats.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** stats.tmpl 4 Oct 2003 12:53:07 -0000 1.1 --- stats.tmpl 29 Feb 2004 19:48:17 -0000 1.1.2.1 *************** *** 1,22 **** !
    ! ! ! ! ! ! ! ! ! !
    Nazwa TypData/czas KwotaOdzia³
    --- 1,22 ---- !
    ! ! ! ! ! ! ! ! ! !
    Imię i Nazwisko TypDate/time KwotaOddział
    *************** *** 24,33 ****

    ! Zap³acono w sumie:
    ! Odpisano w sumie:

    ! --- 24,33 ----

    ! Wpłacono w sumie:
    ! Odpisano w sumie:

    ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/thesaurus_popup.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** thesaurus_popup.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- thesaurus_popup.tmpl 29 Feb 2004 19:48:17 -0000 1.3.2.1 *************** *** 1,43 **** ! Kreator warto¶ci Tezaurusa dla kategorii <TMPL_VAR name="category"> !
    !
    !

    ! "> ! "> ! "> !

    !
    ! ! "> ! "> ! "> ! !
    ! "> ! "> ! wprowad¼ now± authority : !
    ! --- 1,45 ---- ! Tworzenie wartości tezaurusa dla kategorii <!-- TMPL_VAR name="category" -->
    !
    !

    ! "> ! "> ! "> ! "> !

    !
    ! ! "> ! "> ! "> ! "> !
    !
    ! "> ! "> ! "> ! insert a new authority : !
    ! Index: updatebiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/updatebiblio.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** updatebiblio.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- updatebiblio.tmpl 29 Feb 2004 19:48:17 -0000 1.3.2.1 *************** *** 1,14 **** ! ! !

    Kliknij "Prze¶lij..", by wymusiæ przedmiot

    ! ! " value=""> ! ! ">
    --- 1,14 ---- ! ! !

    Click submit to force the subject
    ! ! " value=""> ! ! ">
    *************** *** 16,18 **** ! --- 16,18 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:50:56 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:50:56 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator default_opac_pl_PL.po,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10624 Modified Files: default_opac_pl_PL.po Log Message: minor updates Index: default_opac_pl_PL.po =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/default_opac_pl_PL.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** default_opac_pl_PL.po 28 Feb 2004 15:18:42 -0000 1.3 --- default_opac_pl_PL.po 29 Feb 2004 19:50:53 -0000 1.4 *************** *** 8,12 **** "Project-Id-Version: default_opac_pl_PL\n" "POT-Creation-Date: 2004-02-28 14:09+0100\n" ! "PO-Revision-Date: 2004-02-28 14:26+0100\n" "Last-Translator: Benedict P. Barszcz \n" "Language-Team: Polish \n" --- 8,12 ---- "Project-Id-Version: default_opac_pl_PL\n" "POT-Creation-Date: 2004-02-28 14:09+0100\n" ! "PO-Revision-Date: 2004-02-29 20:34+0100\n" "Last-Translator: Benedict P. Barszcz \n" "Language-Team: Polish \n" *************** *** 485,489 **** #: /home/kb2qzv/CVS-Cervisia/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 ! #,fuzzy msgid "Current Loan" msgstr "Bieżące wypożyczenie" --- 485,489 ---- #: /home/kb2qzv/CVS-Cervisia/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 ! msgid "Current Loan" msgstr "Bieżące wypożyczenie" From kb2qzv at users.sourceforge.net Wed Feb 25 23:30:48 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 14:30:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-detail.tmpl,1.4.2.1,1.4.2.2 opac-main.tmpl,1.4.2.1,1.4.2.2 opac-moredetail.tmpl,1.4.2.1,1.4.2.2 opac-reserve.tmpl,1.4.2.1,1.4.2.2 opac-searchresults.tmpl,1.2.2.1,1.2.2.2 opac-search.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20449/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-searchresults.tmpl opac-search.tmpl Log Message: New, fresh translation by way of xgettext.pl Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** opac-detail.tmpl 22 Feb 2004 17:08:04 -0000 1.4.2.1 --- opac-detail.tmpl 25 Feb 2004 22:30:45 -0000 1.4.2.2 *************** *** 2,6 **** !

    ">Zamów

    --- 2,6 ---- !

    ">Zarezerwuj

    *************** *** 13,17 **** ! ( record ) --- 13,17 ---- ! ( record ) *************** *** 19,41 **** ! ISBN:">
    ! Subtitle:
    ! Autor: ">
    ! Additional Autor:
    Published by : ! in , ,
    ! Collection:
    ! Przedmiot:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number z Items:     --- 19,49 ---- ! ISBN: ">
    ! Podtytuł:
    ! Autor: ">
    ! Dodatkowy Autor:
    Published by : ! w , ,
    ! Kolekcja:
    ! ! ! ! Przedmiot(y): ! : "> !
    ! ! ! ! Rok :
    ! Uwagi:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Pozycji Razem:     *************** *** 45,51 **** ! ! ! --- 53,59 ----
    Typ pozycjiLokalizacjaDate Due Last Seen Kod paskowy
    ! ! ! *************** *** 63,69 **** ! ! --- 71,77 ---- ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** opac-main.tmpl 22 Feb 2004 17:07:51 -0000 1.4.2.1 --- opac-main.tmpl 25 Feb 2004 22:30:45 -0000 1.4.2.2 *************** *** 3,7 **** ! WELCOME TO THE KOHA OPAC !
    Typ PozycjiMiejsceDo Zwrotu Last Seen Kod paskowy
    Website OnlineAvailable  
    Witryna OnlineDostÄ™pna  
    ! ! /images/background-mem.gif"> ! *************** *** 54,67 ****
    !
    ! ! ! !
    ">//images/fileopen.png">">NormalOpis MARC :
    --- 8,25 ---- ! --- 27,55 ---- !
    ! ! /images/background-mem.gif"> ! !
    ! ! ! ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">Zwykłe')">Drukuj')">Dodaj na półkęOpis MARC :
    *************** *** 24,52 ****
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Pozycja
    !
    		! ! ! class="button">Zamów !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    !
    		! ! ! " class="button">Request !
    ! ! /images/background-mem.gif"> ! ! ! ! ! --- 57,70 ----
    !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! *************** *** 71,240 ****
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! ! !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/moredetail.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** moredetail.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- moredetail.tmpl 29 Feb 2004 19:41:43 -0000 1.1.2.1 *************** *** 1,53 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !

    ! ! ! ! &type=intra> ! ()

    ! > ! > ! ! --- 1,48 ---- !

    ! !
    GRUPA -
    ! !
    ! Numer opisu:
    ! Typ pozycji:
    ! URL:
    ! Okres wypo¿yczenia:
    ! Op³ata za wypo¿yczenie:
    ! Classification:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilus:
    ! Wymiary:
    ! Notatki:
    ! W sumie pozycji:
    ! ! ! !
    ! >Requests !
    !

    &type=intra> ()

    ! > ! > ! ! *************** *** 55,99 ****
    /images/background-mem.gif" ! > GRUPA -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Numeropisu:
    ! Typ pozycji:
    ! URL:
    ! Okres wypożyczenia:
    ! Opłata wynajmu:
    ! Klasyfikacja:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilus:
    ! Rozmiar:
    ! Uwagi:
    ! Liczba Egzemplarzy:
    ! ! ! !
    KOD KRESKOWY !
    ! > ! > ! > ! !
    ! Odzia³ w³a¶ciwy:
    ! Oddano?:
    ! Wypo¿yczono?:
    ! Ostatni czytelnik 1:
    ! Ostatni czytelnik 2:
    ! Bie¿±cy oddzia³:
    ! Cena wymiany:
    ! Pozycja zagubiona:
    ! Zap³acono dla:
    ! Uwagi:
    ! Wznowienia:
    ! &biblio=&invoice=&catview=yes"> ! Accession ! Data:
    ! Anulowano:
    &bi=&itm=> ! W sumie wypo¿yczeñ:
    ! Numer grupy:
    ! Numer opisu:
    --- 50,90 ----
    ! ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">BARCODE
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Oddział Właściwy:
    ! Ostatnio rejestrowana:
    ! Ostatnio pozyczono:
    ! ! ! Ostatni Czytelnik 1:
    ! Ostatni Czytelnik 2:
    ! Obecny Oddział:
    ! Cena Wymiany:
    ! Egzemplarz zgubiony:
    ! Opłacono przez:
    ! Uwagi:
    ! Przedłużenia:
    ! &biblio=&invoice=&catview=yes"> Nabyto dnia:
    ! Anulowano:
    &bi=&itm=>Wypożyczeń w sumie:
    ! Numer Grupy:
    ! Numer Opisu:
    *************** *** 104,108 ****
    !

    --- 95,99 ----

    !

    *************** *** 110,112 ****

    ! --- 101,103 ----
    ! Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** searchresults.tmpl 27 Oct 2003 15:41:28 -0000 1.2 --- searchresults.tmpl 29 Feb 2004 19:41:43 -0000 1.2.2.1 *************** *** 1,83 **** ! ! ! ! !
    ! ! Szuka³e¶ ! ! Nie poda³e¶ kryteriów wyszukiwania
    !     ! znalezionych trafieñ

    ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> !

    ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> --- 1,87 ---- ! ! ! ! !
    ! ! You searched on ! ! You did not specify any seach criteria
    ! ! znalezionych rekordów

    ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> !

    !

    Tytu³Autor©Ilo¶æLokalizacja 
    ?type=opacintra&bib=>&type=opacintra> >Request
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! &=&type=opacintra>Next Records ! !   !
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> *************** *** 85,101 ****
    ! Wyniki do z trafieñ.
    ! Jeszcze jedno wyszukiwanie ! ! Jeszcze jedno wyszukiwanie ! ! ! ! ! ! --- 89,105 ----
    ! Wyświetlono od do z rekordów.
    ! Spróbuj innej kwerendy ! ! Spróbuj innej kwerendy ! ! ! ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:41:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:41:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ branchtransfers.tmpl,1.1,1.1.2.1 circulation.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8601/circ Modified Files: Tag: rel_2_0 branchtransfers.tmpl circulation.tmpl Log Message: Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/branchtransfers.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** branchtransfers.tmpl 26 Oct 2003 23:39:41 -0000 1.1 --- branchtransfers.tmpl 29 Feb 2004 19:41:57 -0000 1.1.2.1 *************** *** 1,77 **** !
    TytuÅ‚Autor©Item CountLocation 
    ?type=opacintra&bib=>&type=opacintra> >RequestNot Reservable
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! &=&type=opacintra>Next Records ! !   !
    ! ! Nastêpny Czytelnik ! ! Zwroty
    !

    Wypo¿yczalnia: Transfery


    ! Oddzia³:   ! Drukarka:
    ! Zmieñ ustawienia ! > ! >

    ! ! ! > ! > !

    ! ! !

    /images/background-mem.gif">Wykryto rezerwacjê
    ! Zarezerwowano: wykryto rezerwacjê dla (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Pozycja oznaczona czeka:
    ! Pozycja jest oznaczona i czeka w dla (" onClick="openWindow(this,'Member', 480, 640); return false;">).
     ! ! ! > ! > !

    ! !

    ! Ustaw rezerwacjê jako czekaj±c± i transferuj ksi±¿ke do : ! Uniewa¿nij rezerwacjê, nastêpnie spróbuj transferowaæ:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Uniewa¿nij rezerwacjê, nastêpnie spróbuj transferowaæ:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignoruj i powróæ do transferów:
    ! > ! ! value=> ! value=> ! value=> !
    --- 1,73 ---- !
    ! Next Borrower Returns
    !

    Cyrkulacja: Transfery


    ! OddziaÅ‚:   Drukarka:
    ! Zmień Ustawienia ! > ! >

    ! !
    /images/background-mem.gif">Znaleziono RezerwacjÄ™
    ! Reserved: reserve found for (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Oznaczona jako OczekujÄ…ca
    ! Item is marked waiting at for (" onClick="openWindow(this,'Member', 480, 640); return false;">).
    ! !
    ! Set reserve to waiting and transfer book to : ! Anuluj rezerwację a następnie spróbuj transferu:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Anuluj rezerwację a następnie spróbuj transferu:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignore and return to transfers:
    ! > ! ! value=> ! value=> ! value=> !
    *************** *** 80,162 ****
    ! !
    /images/background-mem.gif">Wiadomo¶ci
    ! ! ! Rezerwacja uniewa¿niona
    !     ! ! Pozycja powinna teraz czekaæ w oddziale:
    !     !     ! ! ! Brak pozycji o kodzie kreskowym: ! ! ! Proszê zwrócic pozycjê do rodzimego oddzia³u: ! ! ! Pozycja ju¿ jest w docelowym oddziale. ! ! ! Pozycjê wypo¿yczy³/a " ! onClick="openWindow(this,'Member', 480, 640); return false;"> ! i zosta³a zwrócona. !
    !
    ! /images/holder.gif" width=24 height=24>
    ! !
    /images/background-mem.gif"> ! Wybierz oddzia³
    Oddzia³ docelowy:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Wprowad¼ kod kreskowy ksi±¿ki
    Kod kreskowy pozycji:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Pozycje transferowane
    Kod kreskowyTytu³AutorTypOdDo
    align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center> align=center> align=center>
    ! ! ! --- 76,157 ----

    ! !
    /images/background-mem.gif">Komunikaty
    ! ! ! Reserve Cancelled
    ! ! ! Item should now be waiting at branch:
    ! ! ! ! ! Brak egzemplarza o kodzie: ! ! ! Please return item to home branch: ! ! ! Item is already at destination branch. ! ! ! Item was on loan to " ! onClick="openWindow(this,'Member', 480, 640); return false;"> and has been returned. !
    !
    ! /images/holder.gif" width=24 height=24>

    ! !
    /images/background-mem.gif"> ! Wybierz Oddział
    Oddział Docelowy:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Kod Paskowy Książki
    Kod paskowy pozycji:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Transfered Items
    Kod PaskowyTytułAutorTypFromTo
    > ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> >>>
    ! ! ! Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/circulation.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** circulation.tmpl 29 Oct 2003 23:38:05 -0000 1.2 --- circulation.tmpl 29 Feb 2004 19:41:57 -0000 1.2.2.1 *************** *** 1,62 **** ! ! !
    ! &branch=&printer=&print=yes> ! Nastêpny czytelnik  ! ! Zwroty  ! ! Transfery
    !

    Wypo¿yczalnia: wypo¿yczenia


    ! Oddzia³:
    ! Drukarka:
    ! Zmieñ ustawienia
    ! ! Zwroty ! !   ! ! Transfery !
    !

    Wypo¿yczalnia: wypo¿yczenia


    ! Oddzia³:
    ! Drukarka:
    ! Zmieñ ustawienia
    ! !
    /images/background-mem.gif"> ! Issuing Question
    ! --- 1,50 ---- ! ! !
    ! Próba wypo¿yczenia ! autorstwa dla . !

    ! &branch=&printer=&print=yes"> NastÄ™pny Czytelnik  Zwroty  Transfery
    !

    Cyrkulacja: Wypożyczenia


    ! Oddział:
    ! Drukarka:
    ! Zmień Ustawienia ! "> ! "> !

     

    ! !
    ! Zwroty   Transfery
    !

    Cyrkulacja: Wypożyczenia


    ! Oddział:
    ! Drukarka:
    ! Zmień Ustawienia ! "> ! "> !

     

    ! ! ! ! ! --- 25,29 ---- ! From tipaul at users.sourceforge.net Fri Feb 6 15:12:06 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members imemberentry.tmpl,1.6,1.6.2.1 jmemberentry.tmpl,1.7,1.7.2.1 memberentry.tmpl,1.21.2.1,1.21.2.2 member-password.tmpl,1.5,1.5.2.1 member.tmpl,1.8,1.8.2.1 moremember.tmpl,1.23.2.2,1.23.2.3 readingrec.tmpl,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/koha-tmpl/intranet-tmpl/default/en/members Modified Files: Tag: rel_2_0 imemberentry.tmpl jmemberentry.tmpl memberentry.tmpl member-password.tmpl member.tmpl moremember.tmpl readingrec.tmpl Log Message: template fixes for translation Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** imemberentry.tmpl 9 Dec 2003 10:29:02 -0000 1.6 --- imemberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.6.2.1 *************** *** 22,26 **** --- 22,26 ---- Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** jmemberentry.tmpl 9 Dec 2003 10:29:02 -0000 1.7 --- jmemberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.7.2.1 *************** *** 53,57 **** ! --- 23,27 ---- ! Index: member-password.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** member-password.tmpl 9 Dec 2003 10:29:03 -0000 1.5 --- member-password.tmpl 6 Feb 2004 14:12:04 -0000 1.5.2.1 *************** *** 16,20 **** New Password: >

    ! --- 16,20 ---- New Password: >

    ! Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** member.tmpl 9 Dec 2003 10:29:03 -0000 1.8 --- member.tmpl 6 Feb 2004 14:12:04 -0000 1.8.2.1 *************** *** 42,46 ****
    ! Adult Organisation --- 42,46 ---- ! Adult Organisation Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v retrieving revision 1.23.2.2 retrieving revision 1.23.2.3 diff -C2 -r1.23.2.2 -r1.23.2.3 *** moremember.tmpl 26 Jan 2004 10:46:35 -0000 1.23.2.2 --- moremember.tmpl 6 Feb 2004 14:12:04 -0000 1.23.2.3 *************** *** 15,19 ****

    ! --- 92,97 ---- ! ! Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -r1.17 -r1.17.2.1 *** authorised_values.tmpl 9 Dec 2003 10:29:00 -0000 1.17 --- authorised_values.tmpl 6 Feb 2004 14:12:27 -0000 1.17.2.1 *************** *** 51,56 ****

    Authorised values admin

    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.

    !

    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 subfield is not entered through a free field, but though a list of authorised values.

    New category... --- 51,55 ----

    Authorised values admin

    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.

    !

    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 subfield is not entered through a free field, but though a list of authorised values.

    New category... Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -r1.18 -r1.18.2.1 *** branches.tmpl 9 Dec 2003 10:29:00 -0000 1.18 --- branches.tmpl 6 Feb 2004 14:12:27 -0000 1.18.2.1 *************** *** 2,5 **** --- 2,6 ---- +


    *************** *** 57,61 **** !
    /images/background-mem.gif"> ! Pytanie Wypożyczenia
    ! *************** *** 65,105 **** !
    ! Próba wypożyczenia przez dla . !

    ! --- 53,93 ---- ! ! ! !
    !
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    		!
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    ! *************** *** 110,219 ****
    !
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    		!
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    ! !
    B³±d przy wypo¿yczeniu

    ! ! ! ! !
    /images/background-mem.gif">Wiadomo¶æ
    !     ! !
    ! > ! > ! ! !
    /images/background-mem.gif"> ! Wybierz czytelnika
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Wprowad¼ numer karty czytelnika
    lub fragment nazwiska
    ! ! > ! >
    !     !
    ! ! --- 24,28 ---- ! *************** *** 77,81 **** ! --- 77,81 ---- ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** newimember.tmpl 22 Dec 2003 14:56:35 -0000 1.4.2.1 --- newimember.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.2 *************** *** 37,41 **** ! --- 45,49 ---- ! *************** *** 142,149 **** ! Next Available ! This type only : --- 142,149 ---- ! Next Available ! This type only : *************** *** 155,160 ****
    !
    ! ! ! ! !
    ! ! ! --- 98,207 ----
    /images/background-mem.gif"> ! Wprowad¼ kod kreskowy ksi±¿ki
    ! ! ! ! !
    Kod kreskowy pozycji:
    !
    ! ! !
    ! > Sticky Due Date
    ! > ! > ! > ! ! ! ! > !
    ! !
    Błąd Wypożyczenia Książki

    ! ! ! ! !
    /images/background-mem.gif">Komunikaty
    Nie znaleziono czytelnika
    ! ! ! ! "> ! "> ! ! !
    /images/background-mem.gif"> ! Wybierz czytelnika
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Wprowadź kartę czytelnika
    lub poczÄ…tek nazwiska
    ! ! "> ! ">
    ! ! !
    !
    ! !
    ! ! ! *************** *** 225,312 ****
    /images/background-mem.gif"> ! Kod Paskowy Książki
    ! ! ! ! !
    Kod paskowy pozycji:
    !
    ! ! !
    ! > Sticky Due Date
    ! "> ! "> ! "> ! ! ! ! "> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Dane czytelnika
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Kategoria:
    OBCI¡¯ENIA> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    OBCI¡¯ENIA onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    CZEKA ! ! &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
    !
    Zaleg³o¶ciTak, patrz ni¿ej
    UWAGI
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Wypo¿yczenia dzi¶
    Termin zwrotuKod kreskowyTytu³AutorKlasa
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Poprzednie wypo¿yczenia
    Termin zwrotuKod kreskowyTytu³AutorKlasa
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! --- 213,309 ----

    		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    O czytelniku
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Kategoria:
    GNA>Czytelnik zniknÄ…Å‚ bez adresu
    ZGUBIONA>Karta czytelnika zaginęła
    ODBLOKOWANY>Czytelnik jest odblokowany
    OPÅATY>" onClick="openWindow(this, 'Payment', 480,640)">PÅ‚atność
    >
    OPÅATY" onClick="openWindow(this, 'Payment', 480,640)">PÅ‚atność
    OCZEKUJÄ„CE ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640)"> ()
    !
    ZLEGÅETak, zob. poniżej
    UWAGI
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Dzisiejsze Wypożyczenia
    Do ZwrotuKod PaskowyTytułAutorTyp pozycji
    >> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">">">">
    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Poprzednie Wypożyczenia
    Do ZwrotuKod PaskowyTytułAutorTyp pozycji
    ">"> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">">">">
    ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:45:41 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:45:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters koha2marclinks.tmpl,1.1,1.1.2.1 marc_subfields_structure.tmpl,1.2,1.2.2.1 marctagstructure.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9524/parameters Modified Files: Tag: rel_2_0 koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl Log Message: Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/koha2marclinks.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** koha2marclinks.tmpl 10 Jan 2003 19:46:32 -0000 1.1 --- koha2marclinks.tmpl 29 Feb 2004 19:45:39 -0000 1.1.2.1 *************** *** 1,22 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! !

    !

    Wybierz i sprawd¼ 1 z nastêpuj±cych dla .

    !
    ! "> ! "> ! --- 1,16 ---- ! ! ! !

    !

    Choose and validate 1 of the following for .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! "> ! "> ! *************** *** 26,35 ****
    ! "> ! "> ! --- 20,29 ----
    ! "> ! "> ! *************** *** 39,48 ****
    ! "> ! "> ! --- 33,42 ----
    ! "> ! "> ! *************** *** 52,61 ****
    ! "> ! "> ! --- 46,55 ----
    ! "> ! "> ! *************** *** 65,74 ****
    ! "> ! "> ! --- 59,68 ----
    ! "> ! "> ! *************** *** 78,87 ****
    ! "> ! "> ! --- 72,81 ----
    ! "> ! "> ! *************** *** 91,100 ****
    ! "> ! "> ! --- 85,94 ----
    ! "> ! "> ! *************** *** 104,113 ****
    ! "> ! "> ! --- 98,107 ----
    ! "> ! "> ! *************** *** 117,126 ****
    ! "> ! "> ! --- 111,120 ----
    ! "> ! "> ! *************** *** 130,139 ****
    ! "> ! "> ! --- 124,133 ----
    ! "> ! "> ! *************** *** 144,154 ****
    !

    Aby "odmapowaæ", kliknij ==>

    		 ! ! "> ! "> --- 138,148 ----
    !

    To "unmap", click ==>

    		 ! ! "> ! "> *************** *** 157,189 ****
    ! ! ! ! Linki MARC !

    ! ! ! ! ! ! ! ! ! ! ! ! !
    Pole koha ?EtykietaPodpoleLib ! !
    ">edytuj
    !     ! ! --- 151,183 ----
    ! ! ! ! ÅÄ…cza MARC !

    NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script. !

    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    Koha field ?TagSubfieldLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** marc_subfields_structure.tmpl 27 Jan 2003 08:15:40 -0000 1.2 --- marc_subfields_structure.tmpl 29 Feb 2004 19:45:39 -0000 1.2.2.1 *************** *** 2,118 **** ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    Pole Lib for librarians / for opac Repet MandPole Koha TabAuthorised value or
    ! Thesaurus category
    -
    !
    ! or
    ! or
    !

    Uwaga: w ostatniej kolumnie nale¿y wybraæ: !

    • "Warto¶æ autoryzown±": Odnosi siê do szeregu warto¶ci autoryzowanych dla tego podpola. Spójrz: odpowiednia tablica administratora
      • !
    • "Kategoria tezaurusa": Odnosi siê do kategorii tezaurusa. Zobacz odpowiedni± tablice administratora.
      • !
    • "Kreator warto¶ci: Jest to program w perlu, który pomaga wybraæ warto¶æ pola. Zale¿y on od odmiany-MARC i wype³nia automatycznie niektóre podpola.

    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! dane wymazane !
    '> !     ! ! ! ! ! ! ! ! ! !
    Podpole
     
    POTWIERD¬ WYMAZANIE
    ">
    TakNieTakNie">usuñ
    - ! ! !
    ">Powrót do znaczników
    !     ! --- 2,112 ---- ! ! ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Field Lib for librarians / for opac Repet MandKoha field TabWartość autoryzowana lub
    ! Kategoria tezaurusa
    - " size=40 maxlength=80>
    ! " size=40 maxlength=80>
    ! or
    ! or
    !

    Note: in the last column, you can choose: !

    • An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.
      • !
    • A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.
      • !
    • A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Data deleted ! "> ! ! ! !

    Admin struktury podpól MARC dla

    !

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    !

    The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    ! !
    Subfield
     
    POTWIERDZENIE WYMAZANIA
    ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SubfieldLibKoha field ?Rep ?Mand ?Tab ?Wartości ?Tezaurus ?Val build ?Wymaż
    TakNieTakNie">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marctagstructure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** marctagstructure.tmpl 10 Jan 2003 16:45:34 -0000 1.2 --- marctagstructure.tmpl 29 Feb 2004 19:45:39 -0000 1.2.2.1 *************** *** 1,9 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! !

    !
    ! ! ! ! ! !
    Zmienna
    Lib for librarians
    Lib for opac
    Powtarzalne
    Konieczne
    Warto¶æ autoryzowana (je¶li wybierzesz jak±¶ warto¶æ tutaj, wska¼niki zostan± ograniczone tylko do zbioru tych warto¶ci)
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! dane usuniêto !
    !     ! ! ! Zarz±dzaj struktur± etykiet MARC (znaczników) !
    ! !
    Etykieta (znacznik)
     
    POTWIERD¬ USUNIÊCIE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    EtykietaLibPowtarzalnaKoniecznaAutoryzowana
    warto¶æ    		Podpola  
    TakNieTakNie">podpola">Edytuj">Usuñ
    ! ! !
    -

    !     ! ! ! --- 52,152 ---- ! ! !

    !
    ! ! ! ! ! !
    Tag
    Lib for librarians
    Lib for opac
    Repeatable
    Mandatory
    Wartość Autoryzowana (jeśli wprowadzisz tutaj jakąś wartość to wskaźniki będą ograniczone do listy autoryzowanych wartości)
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Data deleted ! ! ! ! !

    MARC tag structure admin

    ! NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script. ! ! !
    /images/background-mem.gif">tag/images/background-mem.gif">
     
    POTWIERDZENIE WYMAZANIA
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Tag/images/background-mem.gif">Lib/images/background-mem.gif">Repeatable/images/background-mem.gif">Mandatory/images/background-mem.gif">Autoryzowana
    wartość    		/images/background-mem.gif">Subfields/images/background-mem.gif">Edytuj/images/background-mem.gif">Wymaż
    TakNieTakNie">subfields">//images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">//images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    ! ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
    ! ! From rangi at users.sourceforge.net Sun Feb 1 06:21:24 2004 From: rangi at users.sourceforge.net (Chris Cormack) Date: Sat, 31 Jan 2004 21:21:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-user.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8254/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: Fix for 617 and 615 Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-user.tmpl 18 Mar 2003 19:52:37 -0000 1.2 --- opac-user.tmpl 1 Feb 2004 05:21:21 -0000 1.2.2.1 *************** *** 140,144 **** --- 140,148 ----
    		+ + Not renewable + Renew + Not renewable *************** *** 227,231 **** ! Renew --- 231,235 ---- ! Renew From rangi at users.sourceforge.net Sun Feb 1 06:34:19 2004 From: rangi at users.sourceforge.net (Chris Cormack) Date: Sat, 31 Jan 2004 21:34:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-user.tmpl,1.2.2.1,1.2.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19230/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: missed one instance of renewable Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** opac-user.tmpl 1 Feb 2004 05:21:21 -0000 1.2.2.1 --- opac-user.tmpl 1 Feb 2004 05:34:17 -0000 1.2.2.2 *************** *** 139,143 **** ! Not renewable --- 139,143 ---- ! Not renewable From tipaul at users.sourceforge.net Fri Feb 6 15:06:39 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:06:39 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.fr,1.1.2.3,1.1.2.4 tmpl_process.pl,1.5.2.6,1.5.2.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/misc/translator Modified Files: Tag: rel_2_0 intranet.fr tmpl_process.pl Log Message: updated french translation Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** intranet.fr 26 Jan 2004 10:42:27 -0000 1.1.2.3 --- intranet.fr 6 Feb 2004 14:06:36 -0000 1.1.2.4 *************** *** 1,19 **** A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table Une "catégorie thésaurus": se réfère à une catégorie du thésaurus. Voir la table admin correspondante. A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically Un "constructeur de valeur": les constructeurs de valeurs sont des programmes Perl qui vous aide à sélectionner les entrées d'un champ selon une syntaxe MARC. Ils remplissent aussi parfois automatiquement des sous-champs. - A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm UNUSED;Une notice MARC est stockée dans le réservoir aussi lontemps que vous ne lui liez pas d'ouvrage. Lorsque vous saisissez un ISBN ou un titre d'ouvrage, les notices du réservoire sont passées en revues. Si une notice correspondante est trouvée, elle est transférée dans la table active de Koha et supprimée du réservoire. About A propos Abstract Résumé ! Account for ***** Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE Acquisitions Acquisitions ! acquisitions UNUSED;acquisitions [...1006 lines suppressed...] ! Volume Info (for serials) Info Volume (pour périodiques) Waiting En attente WAITING EN ATTENTE --- 1058,1073 ---- value=> ***** values authorised for this subfield valeurs autorisées pour ce sous-champ ! Values related to ***** ! Values related to () UNUSED;1 Variable Variable Various parameters Divers paramètres View Basket Voir Panier Virtual Bookshelves Rayonnages virtuels + Virtual shelves Rayonnages virtuels Volume Volume Volume Date Date Volume Volume Description Description Volume ! Volume Info (for serials ***** ! Volume Info (for serials) UNUSED;Info Volume (pour périodiques) Waiting En attente WAITING EN ATTENTE Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.5.2.6 retrieving revision 1.5.2.7 diff -C2 -r1.5.2.6 -r1.5.2.7 *** tmpl_process.pl 28 Jan 2004 16:46:23 -0000 1.5.2.6 --- tmpl_process.pl 6 Feb 2004 14:06:36 -0000 1.5.2.7 *************** *** 295,299 **** print "Processing $in...\n"; ! # Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; --- 295,299 ---- print "Processing $in...\n"; ! # 'Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; *************** *** 304,309 **** { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^\s+//; # remove trailing blanks, ':' or '*' ! $str =~ s/[\s\*:\[*\(|\.,]*$//; # the line begins with letter(s) followed by optional words and/or spaces --- 304,309 ---- { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^[\s+:\(]*//; # remove useless characters ! $str =~ s/[\s\*:\[*\(|\.,\)]*$//; # the line begins with letter(s) followed by optional words and/or spaces From tipaul at users.sourceforge.net Fri Feb 6 15:10:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:10:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en auth.tmpl,1.4.2.1,1.4.2.2 default.tmpl,1.2,1.2.2.1 member-flags.tmpl,1.2,1.2.2.1 modbibitem.tmpl,1.5,1.5.2.1 newimember.tmpl,1.4.2.1,1.4.2.2 newjmember.tmpl,1.4,1.4.2.1 newmember.tmpl,1.10.2.1,1.10.2.2 opac-main.tmpl,1.2,1.2.2.1 request.tmpl,1.10.2.1,1.10.2.2 shelves.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8000/koha-tmpl/intranet-tmpl/default/en Modified Files: Tag: rel_2_0 auth.tmpl default.tmpl member-flags.tmpl modbibitem.tmpl newimember.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl request.tmpl shelves.tmpl Log Message: template fixes for translation Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** auth.tmpl 19 Dec 2003 17:19:48 -0000 1.4.2.1 --- auth.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.2 *************** *** 35,39 **** ! --- 35,39 ----
    Koha Login
    Cardnumber:
    Password:
    ! Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/default.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** default.tmpl 9 Dec 2003 10:28:57 -0000 1.2 --- default.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 24,28 ****
    Koha Login
    Card number:
    Password:

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** member-flags.tmpl 9 Dec 2003 10:28:57 -0000 1.2 --- member-flags.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 23,27 ****

    ! --- 23,27 ----

    ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** modbibitem.tmpl 9 Dec 2003 10:28:57 -0000 1.5 --- modbibitem.tmpl 6 Feb 2004 14:10:06 -0000 1.5.2.1 *************** *** 24,28 ****

    Item Type" size=20>
    Item type" size=20>
    Location Date DueLast Seen
    Location Date DueLast seen
    ! Card Number --- 37,41 ----
    ! Card number Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** newjmember.tmpl 9 Dec 2003 10:28:58 -0000 1.4 --- newjmember.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.1 *************** *** 42,46 ****
    ! Date Of Birth --- 42,46 ----
    ! Date of birth Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -r1.10.2.1 -r1.10.2.2 *** newmember.tmpl 26 Jan 2004 10:46:35 -0000 1.10.2.1 --- newmember.tmpl 6 Feb 2004 14:10:06 -0000 1.10.2.2 *************** *** 32,36 ****
    ! Card Number --- 32,36 ----
    ! Card number *************** *** 85,89 ****
    ! Date Of Birth --- 85,89 ----
    ! Date of birth *************** *** 230,237 ****

    The following fields have a forbidden value. Please push the back button and try again :

    ! Cardnumber
    ! Invalid_cardnumber
    --- 230,237 ----

    The following fields have a forbidden value. Please push the back button and try again :

    ! Card number
    ! Invalid cardnumber
    Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-main.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- opac-main.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 1,134 **** ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -r1.10.2.1 -r1.10.2.2 *** request.tmpl 26 Jan 2004 10:46:35 -0000 1.10.2.1 --- request.tmpl 6 Feb 2004 14:10:06 -0000 1.10.2.2 *************** *** 45,49 ****
    /images/background-mem.gif">Request/images/background-mem.gif">Item Type /images/background-mem.gif">Classification /images/background-mem.gif">Volume
    /images/background-mem.gif">Request/images/background-mem.gif">Item type /images/background-mem.gif">Classification /images/background-mem.gif">Volume
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png">
    --- 155,161 ----
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> !
    Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** shelves.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- shelves.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 1,41 **** -

    Logged in as: [Log Out]

    - - !
    !
    ! Shelf List

    ! ! - - - !
    ! ! !
    Add a book by barcode:
    !
    ! ! !
    "> ! Contents of shelf !
    !
    ">">" width=10 align=center> ">" width=10 align=center> ">" width=10 align=center> ">
    !
    ! "> ! ! "> ! !

    --- 1,47 ---- !
    !
    ! ! ! ! !
    "> ! Contents of !
    ">"> "> "> ">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Add a book by barcode in : ! ! ! ! "> ! !
    !
    *************** *** 49,102 ****
    - Modify Shelf Contents

    Bookshelves

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Add Shelf:

    !

    ! !

    ! !
    "> ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    Add or Remove Book Shelves - ! ! \ No newline at end of file --- 55,139 ----

    Bookshelves

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Add Shelf !
    !

    !
    !

    !
    !
    ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    ! Add or Remove Book Shelves !

    ! From tipaul at users.sourceforge.net Fri Feb 6 15:12:06 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport AcceptItemCopy.tmpl,1.3,1.3.2.1 marcimportdetail.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/koha-tmpl/intranet-tmpl/default/en/marcimport Modified Files: Tag: rel_2_0 AcceptItemCopy.tmpl marcimportdetail.tmpl Log Message: template fixes for translation Index: AcceptItemCopy.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** AcceptItemCopy.tmpl 9 Dec 2003 10:29:03 -0000 1.3 --- AcceptItemCopy.tmpl 6 Feb 2004 14:12:04 -0000 1.3.2.1 *************** *** 2,6 ****
    ! Barcode '' has already been assigned.

    --- 2,6 ----

    ! Barcode has already been assigned.

    Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** marcimportdetail.tmpl 9 Dec 2003 10:29:03 -0000 1.3 --- marcimportdetail.tmpl 6 Feb 2004 14:12:04 -0000 1.3.2.1 *************** *** 25,29 ****

    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item Type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    ! Member# , Card Number* >
    ! Member# , Card number* >
    ! Member# , Card Number* --- 53,57 ----
    ! Member# , Card number* Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -C2 -r1.21.2.1 -r1.21.2.2 *** memberentry.tmpl 26 Jan 2004 10:46:35 -0000 1.21.2.1 --- memberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.21.2.2 *************** *** 1,11 **** -

    ! Add Member Update Member Details !


    --- 1,14 ---- !

    ! Add member !

    +

    Update Member Details +

    !
    *************** *** 20,24 ****
    Member# , Card Number*
    Member# , Card number*
    (, )

    ! Card Number:
    Postal Address: ,
    Home Address: ,
    --- 15,19 ----

    		(, )

    ! Card number:
    Postal Address: ,
    Home Address: ,
    Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** readingrec.tmpl 22 Dec 2003 10:56:19 -0000 1.7.2.1 --- readingrec.tmpl 6 Feb 2004 14:12:04 -0000 1.7.2.2 *************** *** 3,7 ****


    Member Number: !
    Card Number:

    --- 3,7 ----


    Member Number: !
    Card number:

    From tipaul at users.sourceforge.net Fri Feb 6 15:12:31 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbudget.tmpl,1.20,1.20.2.1 authorised_values.tmpl,1.17,1.17.2.1 branches.tmpl,1.18,1.18.2.1 categorie.tmpl,1.15,1.15.2.1 categoryitem.tmpl,1.7,1.7.2.1 charges.tmpl,1.2,1.2.2.1 currency.tmpl,1.7,1.7.2.1 itemtypes.tmpl,1.14.2.1,1.14.2.2 koha2marclinks.tmpl,1.9,1.9.2.1 marc_subfields_structure.tmpl,1.23.2.1,1.23.2.2 printers.tmpl,1.8,1.8.2.1 thesaurus.tmpl,1.17.2.1,1.17.2.2 z3950servers.tmpl,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8520/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: Tag: rel_2_0 aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl printers.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: template fixes for translation Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -r1.20 -r1.20.2.1 *** aqbudget.tmpl 9 Dec 2003 10:29:00 -0000 1.20 --- aqbudget.tmpl 6 Feb 2004 14:12:26 -0000 1.20.2.1 *************** *** 92,97 **** !

    Start date () 
    End date ()
    Budget amount
     ">
    Start date () 
    End date ()
    Budget amount
     ">
     
    --- 58,62 ----
     
    *************** *** 127,131 **** ! --- 128,132 ---- ! Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -r1.15 -r1.15.2.1 *** categorie.tmpl 9 Dec 2003 10:29:00 -0000 1.15 --- categorie.tmpl 6 Feb 2004 14:12:27 -0000 1.15.2.1 *************** *** 194,201 **** - Bulk - - - Enrollment fee --- 194,197 ---- *************** *** 238,242 **** Data deleted !

    --- 234,238 ---- Data deleted !
    *************** *** 247,270 ****

    Category admin

    ! You Searched for !
    ! > !
    ! ! - - ! --- 243,265 ----

    Category admin

    ! You Searched for ! ! > ! !
    Category DescriptionEnrollment Upper Age Limit Age Required FineBulkFee OverdueIssue Limit Reserve
    ! ! ! *************** *** 276,285 **** ! ! ! --- 271,284 ---- + ! *************** *** 292,296 ****

    !

    --- 291,295 ----

    !

    Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** categoryitem.tmpl 9 Dec 2003 10:29:00 -0000 1.7 --- categoryitem.tmpl 6 Feb 2004 14:12:27 -0000 1.7.2.1 *************** *** 269,273 **** ! --- 269,273 ---- ! *************** *** 294,298 ****

    !

    --- 294,298 ----

    !

    Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** charges.tmpl 9 Dec 2003 10:29:00 -0000 1.2 --- charges.tmpl 6 Feb 2004 14:12:27 -0000 1.2.2.1 *************** *** 2,8 ****

    Each box needs to be filled in with fine,time to start charging,charging cycle
    ! eg 1,7,7 = $1 fine, after 7 days, every 7 days

    !

    Note : fines are calculated by the fines2.pl script, located in misc directory. ! Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

    --- 2,7 ----

    Each box needs to be filled in with fine,time to start charging,charging cycle
    ! eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    !

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

    Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** currency.tmpl 9 Dec 2003 10:29:00 -0000 1.7 --- currency.tmpl 6 Feb 2004 14:12:27 -0000 1.7.2.1 *************** *** 182,187 **** ! ! --- 182,187 ---- ! ! *************** *** 202,206 ****
    !
    --- 202,206 ----
    !
    Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -r1.14.2.1 -r1.14.2.2 *** itemtypes.tmpl 12 Jan 2004 19:20:33 -0000 1.14.2.1 --- itemtypes.tmpl 6 Feb 2004 14:12:27 -0000 1.14.2.2 *************** *** 81,90 **** ! ! --- 81,99 ---- ! ! *************** *** 157,161 **** --- 166,170 ---- Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** koha2marclinks.tmpl 9 Dec 2003 10:29:01 -0000 1.9 --- koha2marclinks.tmpl 6 Feb 2004 14:12:27 -0000 1.9.2.1 *************** *** 164,168 ****
    Category DescriptionEnrollment periodEnrollment fee Upper Age Limit Age Required Fine OverdueIssue limit Reserve YesNo ! Yes ! ! No ! ! Fee OverdueIssue Limit Reserve Fee OverdueIssue limit Reserve
    EditDelete
    EditDelete
    Not for loanchecked value=1> (if checked, no item of this type can be issued. ! If not checked, every item of this type can be issued unless notforloan is set for a specific item)
    Loan length (meaningful only if not for loan is not set)
    Not for loan ! ! ! ! ! ! if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item !
    Loan length ! ! meaningful only if not for loan is not set !
    ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
    ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
    ! --- 164,168 ----
    koha field ? Tag Subfield
    ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -C2 -r1.23.2.1 -r1.23.2.2 *** marc_subfields_structure.tmpl 20 Jan 2004 10:23:30 -0000 1.23.2.1 --- marc_subfields_structure.tmpl 6 Feb 2004 14:12:27 -0000 1.23.2.2 *************** *** 68,75 **** ! MARC subfield structure admin for !

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit".

    !

    The column Koha field shows that the subfield is linked with a "Koha field". Koha can manage a MARC interface, or a Koha interface. This link ensures that ! both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    Koha field ? Tag Subfield
    --- 68,74 ---- !

    MARC subfield structure admin for

    !

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    !

    The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    *************** *** 77,81 **** ! --- 76,80 ---- ! Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** printers.tmpl 9 Dec 2003 10:29:01 -0000 1.8 --- printers.tmpl 6 Feb 2004 14:12:27 -0000 1.8.2.1 *************** *** 195,199 ****
    !
    --- 195,199 ----
    !
    Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -r1.17.2.1 -r1.17.2.2 *** thesaurus.tmpl 26 Jan 2004 10:46:35 -0000 1.17.2.1 --- thesaurus.tmpl 6 Feb 2004 14:12:27 -0000 1.17.2.2 *************** *** 99,103 ****

    Manages thesaurus and authorities files.

      ! Dig: see data dependent one this one
      Related: see other forms of this authority entry

    --- 99,103 ----

    Manages thesaurus and authorities files.

      ! Dig: see data depending of this one
      Related: see other forms of this authority entry

    *************** *** 125,129 **** ! --- 125,129 ---- ! Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** z3950servers.tmpl 9 Dec 2003 10:29:02 -0000 1.11 --- z3950servers.tmpl 6 Feb 2004 14:12:27 -0000 1.11.2.1 *************** *** 74,78 ****

    Modify Z39.50 Server

    !

    Add Z39.50 Server

    --- 74,78 ----

    Modify Z39.50 Server

    !

    Add Z39.50 server

    *************** *** 280,284 ****
    !
    --- 280,284 ----
    !
    From tipaul at users.sourceforge.net Fri Feb 6 15:13:03 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:13:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc search.tmpl,1.9.2.2,1.9.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8704/koha-tmpl/intranet-tmpl/default/en/search.marc Modified Files: Tag: rel_2_0 search.tmpl Log Message: template fixes for translation Index: search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -r1.9.2.2 -r1.9.2.3 *** search.tmpl 26 Jan 2004 10:46:35 -0000 1.9.2.2 --- search.tmpl 6 Feb 2004 14:12:45 -0000 1.9.2.3 *************** *** 5,9 **** ! MARC Search
    --- 5,9 ---- ! MARC search
    *************** *** 14,25 **** "> !
    Subfield Libkoha field ? Rep ? Mand ?Subfield LibKoha field ? Rep ? Mand ? Dig Related ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> Dig   Related ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! !
    		HELP :
    --- 14,25 ---- "> ! ! ! ! --- 28,33 ---- !
    		HELP :
    *************** *** 28,32 ****
    ! From tipaul at users.sourceforge.net Fri Feb 6 15:14:02 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:14:02 -0800 Subject: [Koha-cvs] CVS: koha/acqui order.pl,1.9,1.9.2.1 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8988/acqui Modified Files: Tag: rel_2_0 order.pl Log Message: managing active/inactive suppliers. user can't create an order on an inactive supplier Index: order.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/order.pl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** order.pl 8 Jul 2003 16:20:15 -0000 1.9 --- order.pl 6 Feb 2004 14:13:59 -0000 1.9.2.1 *************** *** 64,67 **** --- 64,68 ---- $line{id} =$suppliers[$i]->{'id'}; $line{name} = $suppliers[$i]->{'name'}; + $line{active} = $suppliers[$i]->{'active'}; $line{total} = $orders->[0]->{'count(*)'}; $line{authorisedby} = $orders->[0]->{'authorisedby'}; From tipaul at users.sourceforge.net Fri Feb 6 15:15:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:15:10 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.32.2.4,1.32.2.5 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.pl Log Message: indicators are back... they were stored but now shown on screen Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.32.2.4 retrieving revision 1.32.2.5 diff -C2 -r1.32.2.4 -r1.32.2.5 *** addbiblio.pl 26 Jan 2004 10:34:53 -0000 1.32.2.4 --- addbiblio.pl 6 Feb 2004 14:14:55 -0000 1.32.2.5 *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $indicator; $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 240,244 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); From tipaul at users.sourceforge.net Fri Feb 6 15:16:57 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:16:57 -0800 Subject: [Koha-cvs] CVS: koha/C4 BookShelves.pm,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9794/C4 Modified Files: Tag: rel_2_0 BookShelves.pm Log Message: fixing bugs in bookshelves management. Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** BookShelves.pm 15 Dec 2003 10:57:08 -0000 1.11 --- BookShelves.pm 6 Feb 2004 14:16:55 -0000 1.11.2.1 *************** *** 145,163 **** #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! my $sth=$dbh->prepare("select * from shelfcontents ! where shelfnumber=? and itemnumber=?"); ! ! $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents ! (shelfnumber, itemnumber, flags) values (?, ?, 0)"); - # FIXME - The default for 'flags' is NULL. - # Why set it to 0? $sth->execute($shelfnumber, $itemnumber); ! } } --- 145,159 ---- #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! return unless $itemnumber; ! my $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); ! $sth->execute($shelfnumber, $itemnumber); ! } } *************** *** 244,247 **** --- 240,246 ---- # # $Log$ + # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.11 2003/12/15 10:57:08 slef # DBI call fix for bug 662 From tipaul at users.sourceforge.net Fri Feb 6 15:15:58 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:15:58 -0800 Subject: [Koha-cvs] CVS: koha/C4 Authorities.pm,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9512/C4 Modified Files: Tag: rel_2_0 Authorities.pm Log Message: modifying order (mysql auto sort by relevance) Index: Authorities.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Authorities.pm,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** Authorities.pm 26 Jan 2004 10:36:42 -0000 1.7.2.1 --- Authorities.pm 6 Feb 2004 14:15:56 -0000 1.7.2.2 *************** *** 193,199 **** } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " order by category,freelib limit ?,?"; push(@bind,$offset,($pagesize*4)); ! # warn "q : $query"; my $sth=$dbh->prepare($query); $sth->execute(@bind); --- 193,199 ---- } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " limit ?,?"; push(@bind,$offset,($pagesize*4)); ! warn "q : $query". at bind; my $sth=$dbh->prepare($query); $sth->execute(@bind); From tipaul at users.sourceforge.net Fri Feb 6 15:22:25 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:22:25 -0800 Subject: [Koha-cvs] CVS: koha shelves.pl,1.12,1.12.2.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11270 Modified Files: Tag: rel_2_0 shelves.pl Log Message: fixing bugs in bookshelves management. Index: shelves.pl =================================================================== RCS file: /cvsroot/koha/koha/shelves.pl,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** shelves.pl 5 Feb 2003 10:04:14 -0000 1.12 --- shelves.pl 6 Feb 2004 14:22:19 -0000 1.12.2.1 *************** *** 5,10 **** # $Header$ # - - # Copyright 2000-2002 Katipo Communications # --- 5,8 ---- *************** *** 36,40 **** my $env; my $query = new CGI; - #print $query->header(-cookie => $cookie); my $headerbackgroundcolor='#663266'; my $circbackgroundcolor='#555555'; --- 34,37 ---- *************** *** 45,83 **** = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {parameters => 1}, ! }); ! #print startpage(); ! #print startmenu('catalogue'); ! #print "

    Logged in as: $loggedinuser [Log Out]

    \n"; ! ! ! my ($shelflist) = GetShelfList(); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); } - } } SWITCH: { ! $template->param({ loggedinuser => $loggedinuser, ! viewshelf => $query->param('viewshelf'), ! shelves => $query->param('shelves'), ! headerbackgroundcolor => $headerbackgroundcolor, ! circbackgroundcolor => $circbackgroundcolor }); ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 42,77 ---- = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {catalogue => 1}, ! }); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); ! } } } + my ($shelflist) = GetShelfList(); + $template->param({ loggedinuser => $loggedinuser, + headerbackgroundcolor => $headerbackgroundcolor, + circbackgroundcolor => $circbackgroundcolor }); SWITCH: { ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! } ! ! ($shelflist) = GetShelfList(); # rebuild shelflist in case a shelf has been added ! ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 87,106 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); - } - $template->param(shelvesloop => \@shelvesloop); } output_html_with_http_headers $query, $cookie, $template->output; - sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); } - } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { --- 81,98 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); } + $template->param(shelvesloop => \@shelvesloop); output_html_with_http_headers $query, $cookie, $template->output; sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); ! } } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { *************** *** 114,123 **** #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 106,115 ---- #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 127,143 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop); } - - sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 119,135 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop, ! shelves => 1, ! ); } sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 148,162 **** $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop); ! $template->param( shelfname => $shelflist->{$shelfnumber}->{'shelfname'}); ! $template->param( shelfnumber => $shelfnumber); } - #print endpage(); - #print endmenu('catalogue'); - # # $Log$ # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains --- 140,156 ---- $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop, ! shelfname => $shelflist->{$shelfnumber}->{'shelfname'}, ! shelfnumber => $shelfnumber, ! viewshelf => $query->param('viewshelf'), ! ); } # # $Log$ + # Revision 1.12.2.1 2004/02/06 14:22:19 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains From tipaul at users.sourceforge.net Fri Feb 6 15:21:56 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:21:56 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.85.2.3,1.85.2.4 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11122/C4 Modified Files: Tag: rel_2_0 Search.pm Log Message: bugfix for subject search. Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85.2.3 retrieving revision 1.85.2.4 diff -C2 -r1.85.2.3 -r1.85.2.4 *** Search.pm 26 Jan 2004 10:39:16 -0000 1.85.2.3 --- Search.pm 6 Feb 2004 14:21:54 -0000 1.85.2.4 *************** *** 1146,1150 **** } else { if ($type eq 'subject'){ ! $query .= "group by subject order by subject "; } } --- 1146,1150 ---- } else { if ($type eq 'subject'){ ! $query .= "order by subject group by subject "; } } From acli at users.sourceforge.net Tue Feb 10 01:43:24 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 16:43:24 -0800 Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.45,1.46 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4553 Modified Files: Output.pm Log Message: This allows the user to type zh_TW and still get Chinese from the zh-TW directory. Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** Output.pm 2 Dec 2003 22:13:25 -0000 1.45 --- Output.pm 10 Feb 2004 00:43:21 -0000 1.46 *************** *** 130,137 **** foreach my $th (@themes) { foreach my $la (@languages) { ! if (-e "$htdocs/$th/$la/$tmpl") { ! $theme = $th; ! $lang = $la; ! last THEME; } } --- 130,141 ---- foreach my $th (@themes) { foreach my $la (@languages) { ! for (my $pass = 1; $pass <= 2; $pass += 1) { ! $la =~ s/([-_])/ $1 eq '-'? '_': '-' /eg if $pass == 2; ! if (-e "$htdocs/$th/$la/$tmpl") { ! $theme = $th; ! $lang = $la; ! last THEME; ! } ! last unless $la =~ /[-_]/; } } From acli at users.sourceforge.net Tue Feb 10 00:34:10 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 15:34:10 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21182 Modified Files: tmpl_process.pl Log Message: Minor spelling correction. Don't proceed if the user specified an unknown option. Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** tmpl_process.pl 9 Dec 2003 10:26:51 -0000 1.5 --- tmpl_process.pl 9 Feb 2004 23:34:08 -0000 1.6 *************** *** 19,23 **** 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help); help() if $help; --- 19,24 ---- 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help, ! ) || (usage(), exit(-1)); help() if $help; *************** *** 42,46 **** if( !(-d $in_files[0]) && !(-f $in_files[0])) { ! usage("Unknow input. Input must a file or a directory. (Symbolic links are not supported for the moment)."); } elsif( -d $in_files[0] ) --- 43,47 ---- if( !(-d $in_files[0]) && !(-f $in_files[0])) { ! usage("Unknown input. Input must a file or a directory. (Symbolic links are not supported for the moment.)"); } elsif( -d $in_files[0] ) From acli at users.sourceforge.net Tue Feb 10 01:58:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 16:58:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8108/parameters Modified Files: admin-home.tmpl Log Message: Spelling mistake Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** admin-home.tmpl 9 Dec 2003 13:46:28 -0000 1.25 --- admin-home.tmpl 10 Feb 2004 00:58:49 -0000 1.26 *************** *** 11,15 ****     ! --- 11,15 ---- ! From acli at users.sourceforge.net Mon Feb 9 23:36:35 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 14:36:35 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.70,1.71 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4855/misc Modified Files: Install.pm Log Message: Fix of bug 711, "No message named WhereisMySQL in Install.pm". Added defined() check for "Use of uninitialized value in -e at Install.pm line 2085, line 32." Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -r1.70 -r1.71 *** Install.pm 22 Dec 2003 19:16:58 -0000 1.70 --- Install.pm 9 Feb 2004 22:36:32 -0000 1.71 *************** *** 998,1002 **** if (!$mysqldir){ for (;;) { ! $mysqldir = showmessage(getmessage('WhereisMySQL'),'free'); last if -f "$mysqldir/bin/mysqladmin"; } --- 998,1002 ---- if (!$mysqldir){ for (;;) { ! $mysqldir = showmessage(getmessage('WhereIsMySQL'),'free'); last if -f "$mysqldir/bin/mysqladmin"; } *************** *** 2080,2087 **** sub restoremycnf { ! if (-e $mycnf) { unlink($mycnf); } ! if (-e $mytmpcnf) { rename $mytmpcnf,$mycnf; } --- 2080,2087 ---- sub restoremycnf { ! if (defined $mycnf && -e $mycnf) { unlink($mycnf); } ! if (defined $mytmpcnf && -e $mytmpcnf) { rename $mytmpcnf,$mycnf; } From acli at users.sourceforge.net Tue Feb 10 03:53:24 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 18:53:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28881/includes Modified Files: common-style.css Log Message: We can't use A.home, A.about, etc. for Chinese, otherwise the padding will cause the links to become very ugly; this is better. (It is probably better for other translations as well...) Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** common-style.css 16 Jul 2003 06:37:46 -0000 1.1 --- common-style.css 10 Feb 2004 02:53:09 -0000 1.2 *************** *** 39,51 **** } ! a.home { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.home:hover { background-color: #339933; color: #000000; --- 39,57 ---- } ! /* ! * We can't use a.home, etc. for Chinese. ! * Otherwise the screen will be extremely ugly because of the padding ! */ ! td.home { ! padding:4px; ! } ! td.home a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.home a:hover { background-color: #339933; color: #000000; *************** *** 55,68 **** } ! a.catalogue { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; margin:0; } ! a.catalogue:hover { font-weight: normal; text-decoration: none; --- 61,76 ---- } ! td.catalogue { ! padding:4px; ! } ! td.catalogue a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; margin:0; } ! td.catalogue a:hover { font-weight: normal; text-decoration: none; *************** *** 73,85 **** } ! a.members { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.members:hover { background-color: #86c268; color: #000000; --- 81,95 ---- } ! td.members { ! padding:4px; ! } ! td.members a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.members a:hover { background-color: #86c268; color: #000000; *************** *** 88,100 **** } ! a.acquisition { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.acquisition:hover { background-color: #ffdf61; color: #000000; --- 98,112 ---- } ! td.acquisition { ! padding:4px; ! } ! td.acquisition a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.acquisition a:hover { background-color: #ffdf61; color: #000000; *************** *** 103,115 **** } ! a.reports { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.reports:hover { background-color: #6b7cbe; color: #000000; --- 115,129 ---- } ! td.reports { ! padding:4px; ! } ! td.reports a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.reports a:hover { background-color: #6b7cbe; color: #000000; *************** *** 118,130 **** } ! a.circulation { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.circulation:hover { background-color: #be6170; color: #000000; --- 132,146 ---- } ! td.circulation { ! padding:4px; ! } ! td.circulation a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.circulation a:hover { background-color: #be6170; color: #000000; *************** *** 133,145 **** } ! a.parameters { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.parameters:hover { background-color: #86c268; color: #000000; --- 149,163 ---- } ! td.parameters { ! padding:4px; ! } ! td.parameters a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.parameters a:hover { background-color: #86c268; color: #000000; *************** *** 147,159 **** font-weight: bold; } ! a.about { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.about:hover { background-color: #86c268; color: #000000; --- 165,180 ---- font-weight: bold; } ! ! td.about { ! padding:4px; ! } ! td.about a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.about a:hover { background-color: #86c268; color: #000000; From acli at users.sourceforge.net Tue Feb 10 03:55:03 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 18:55:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269/includes Modified Files: common-style.css Log Message: Sync to en/include/common-style.css Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** common-style.css 10 Feb 2004 02:53:09 -0000 1.2 --- common-style.css 10 Feb 2004 02:55:01 -0000 1.3 *************** *** 14,17 **** --- 14,21 ---- } + #problem { + color: red; + font-weight:bold; + } #menubar { border-top:1px solid #666666; *************** *** 29,32 **** --- 33,47 ---- cursor: hand; color:#777777; + background-color:#EEEEEE; + padding:4px; + font-weight: bold; + margin:0; + } + a.submenu2 { + font-weight: normal; + text-decoration: none; + cursor: hand; + color:#777777; + background-color:#CCCCCC; padding:4px; font-weight: bold; From acli at users.sourceforge.net Tue Feb 10 04:00:39 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:00:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30007/includes Modified Files: parameters-top.inc Log Message: Changed DTD declaration so that Mozilla will use standards mode for this. Use more standard translation for "About" Minor updates Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** parameters-top.inc 16 Jul 2003 08:10:33 -0000 1.3 --- parameters-top.inc 10 Feb 2004 03:00:37 -0000 1.4 *************** *** 1,3 **** ! --- 1,3 ---- ! *************** *** 36,66 **** --- 60,64 ---- *************** *** 86,95 **** --- 70,79 ---- From acli at users.sourceforge.net Tue Feb 10 04:00:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:00:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-bottom.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30203/includes Modified Files: parameters-bottom.inc Log Message: Use more standard translation for "About" Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** parameters-bottom.inc 16 Jul 2003 04:52:13 -0000 1.2 --- parameters-bottom.inc 10 Feb 2004 03:00:50 -0000 1.3 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! ¦³ÃöKoha || Help --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || Help From acli at users.sourceforge.net Tue Feb 10 04:01:02 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:01:02 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes acquisitions-top.inc,1.1,1.2 cat-top.inc,1.1,1.2 circulation-top.inc,1.1,1.2 issues-top.inc,1.1,1.2 members-top.inc,1.1,1.2 opac-top.inc,1.1,1.2 reports-top.inc,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30227/includes Modified Files: acquisitions-top.inc cat-top.inc circulation-top.inc issues-top.inc members-top.inc opac-top.inc reports-top.inc Log Message: Changed DTD declaration so that Mozilla will use standards mode for this. Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/acquisitions-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquisitions-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- acquisitions-top.inc 10 Feb 2004 03:00:59 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/cat-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cat-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- cat-top.inc 10 Feb 2004 03:00:59 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/circulation-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- circulation-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/issues-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** issues-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- issues-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/members-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** members-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- members-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/opac-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- opac-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/reports-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reports-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- reports-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! From acli at users.sourceforge.net Tue Feb 10 04:01:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:01:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30355/parameters Modified Files: admin-home.tmpl Log Message: Sync to en Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** admin-home.tmpl 6 Feb 2003 06:37:47 -0000 1.3 --- admin-home.tmpl 10 Feb 2004 03:01:36 -0000 1.4 *************** *** 1,87 **** - - -

    ±z¥Ø«eµn¤J¬°: [µn¥X]

    - -

    µn¤J Koha

    -
    ! Kohaªº¨t²Î³]©w
    !
    Library branchesThe differents branches you manage with this Koha server.
     
    Library branchesThe different branches you manage with this Koha server.
     
    !
    ¨t²Î°Ñ¼Æ
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ®Ñ¥Ø¬ÛÃö³]©w
    À]ÂÃÃþ§O¦UºØÀ]Â꺤ÀÃþ
    °]¬F¹wºâthe budgets allowed to differents book funds.
    book fundsthe differents book funds.
    ®e³\­È³]©w®e³\­ÈªºÃþ§O¤Î¬ÛÃöªº®e³\­È¡C ! ¦b¾÷Ū®æ¦¡µ²ºcªº³]©w¸Ì¡A¥i«ü©w¬Y¨Ç¤ÀÄæ¥u¯à¥Î¬Y¨Ç¡u®e³\­È¡v¡A¥O¿é¤J®Ñ¥Ø®É¥i¥H´î¤Ö¿ù»~©Î§ó¥[¤è«K
    ThesaurusThesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
    ¾÷Ū®æ¦¡ (MARC) ¬ÛÃö³]©w
    ©w¸q¾÷Ū®æ¦¡ªºµ²ºc¾÷Ū®æ¦¡ªºµ²ºc¡GÄæ¤Î¤ÀÄæ
    ©w¸q¾÷Ū®æ¦¡©Mkoha¸ê®Æ®w¶¡ªº³sµ²©w¸qKoha¸ê®Æ®w©M¾÷Ū®æ¦¡¸ê®Æ®w¶¡ªºÃö«Y¡Cµù¡G¨Ï¥Î¡u©w¸q¾÷Ū®æ¦¡ªºµ²ºc¡v¥\¯à¤]¥i°µ¨ì³oÂI¡A¦ý¥Î³o­Ó¤u¨ã°µ³sµ²·|§Ö¤@¨Ç¡C
    ®Ö¹ï¾÷Ū®æ¦¡µ²ºc®Ö¹ê¾÷Ū®æ¦¡µ²ºcªº©w¸q¦³¨S¦³¾É­P¸ê®Æ®w¤£¯à¥¿±`¾Þ§@ªºÄY­«¿ù»~¡C³B²z¯u¥¿ªº¸ê®Æ«e¡A°È¥²¥Î³o­Ó®Ö¤@®Ö¹ï¡I
    ¨ä¥L°Ñ¼Æ
    ¤ÀÀ]³]©w³o®M Koha ¦øªA¾¹¥Ñ­þ¨Ç¹Ï®ÑÀ]¦@¥Î
    ŪªÌÃþ§O³]©w¤£¦PªºÅªªÌÃþ§O
    ¹ô­È³]©w®ÑÂǨÑÀ³°Ó¥Î¤°»ò³f¹ô
    ¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|) ³]©w
    stopword¬d¸ß®ÉÀ³¸Ó¬Ù²¤ªº¦r²´
    Z39.50 ¦øªA¾¹¥Î¨Ó¬d¸ß¾÷Ū®æ¦¡¸ê®Æªº¦U¦øªA¾¹
    ¨t²Î°¾¦n¨ä¥L¼vÅT¨t²Î¹B§@ªº°¾¦n³]©w
    ! !
    ¬ÛÃö¤u¨ã
    ¶×¥X
    MARC biblio export ¥H¾÷Ū®æ¦¡¶×¥X
    --- 1,123 ----
    !

    ³]©w

    ! !
    ¨t²Î°Ñ¼Æ
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + ! ! + ! ! + ! + ! ! ! ! + ! ! + + + + + + + ! + + ! ! + ! + ! + !
    ­nKoha¯à¥¿±`¹B§@¡A½Ð±z°È¥²¨Ì¦¸¶ñ§´¤U¦Cªº¦U¶µ³]©w
    À]§O³]©w³o­ÓKoha¦øªA¾¹©Ò­t³dªº¦UÀ]
     
    book fund¥Î¥HÁʸm®ÑÂǪº¦UºØ¸êª÷
     
    ³f¹ô¶×²v³]©w¶×²v
     
    À]ÂÃÃþ§O³]©w¦UºØ¹Ï®Ñ¸ê®Æªº¤ÀÃþ
     
    ŪªÌÃþ§O³]©wŪªÌªº¤ÀÃþ
     
    »@´Ú³]©w¦UÃþŪªÌ­É¥X¦UÃþ¹Ï®Ñ¸ê®Æªº¦UºØ»@´Ú
     
    ®e³\­È³]©w®e³\­ÈªºÃþ§O¤Î¬ÛÃöªº®e³\­È¢w¢w­×§ï¾÷Ū®æ¦¡ªº®Ñ¥Ø®É¡A®e³\­È¥i¥HÅý­×§ï¾÷Ū®æ¦¡®É´î¤Ö¿ù»~¥H¤Î¸û¬°¤è«K
     
    ThesaurusManagement of thesaurus and authorities files.
     
    ¾÷Ū®æ¦¡Äæ¦ìµ²ºc³]©w¾÷Ū®æ¦¡ªºÄæ¦ìµ²ºc (Äæ¤Î¤ÀÄæ)
     
    ³sµ²Koha¤Î¾÷Ū®æ¦¡¸ê®Æ®w©w¸qKoha¸ê®Æ®w©M¾÷Ū®æ¦¡¸ê®Æ®w¶¡ªºÃö«Y¡Cµù¡G¥u¥Î¡u¾÷Ū®æ¦¡Äæ¦ìµ²ºc¡v¥\¯à¤]¥i§¹¦¨³o­Ó¨BÆJ¡A¦ý¥Î³o­Ó¤u¨ã°µ³sµ²·|¸û§Ö¡C
     
    ®Ö¹ï¾÷Ū®æ¦¡µ²ºc®Ö¹ê¾÷Ū®æ¦¡µ²ºcªº©w¸q¦³¨S¦³¾É­P¸ê®Æ®w¤£¯à¥¿±`¾Þ§@ªºÄY­«¿ù»~¡C³B²z¯u¥¿ªº¸ê®Æ«e¡A°È¥²¥Î³o­Ó®Ö¤@®Ö¹ï¡I
     
    ¨ä¥L¦UºØ°Ñ¼Æ
     
    ¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|)
     
    stopword³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
     
    Z39.50 ¦øªA¾¹³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
     
    ¨t²Î°¾¦n³]©w¨t²Î°¾¦n
    ! !
    ¬ÛÃö¤u¨ã
    + + + + + + + + +
    ¶×¥X
    MARC biblio export ¥H¾÷Ū®æ¦¡¶×¥X
    ¶×¤J
    ¤W¸ü¾÷Ū®æ¦¡°O¿ý¦Ü¡uBreeding Farm¡vThe breeding farm is a table where imported MARC records are + stored.
    + A MARC record is stored in the breeding farm as long as + you have no item. When you type the ISBN or title of a biblio, it's searched for + in the breeding farm. + If it is found, the biblio is added to Koha active table + and removed from the breeding farm.
    +
    From acli at users.sourceforge.net Tue Feb 10 04:08:02 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:08:02 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31600/parameters Modified Files: admin-home.tmpl Log Message: Minor improvements Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** admin-home.tmpl 10 Feb 2004 03:01:36 -0000 1.4 --- admin-home.tmpl 10 Feb 2004 03:08:00 -0000 1.5 *************** *** 9,22 **** ! ! ! --- 9,22 ----
    ­nKoha¯à¥¿±`¹B§@¡A½Ð±z°È¥²¨Ì¦¸¶ñ§´¤U¦Cªº¦U¶µ³]©w
    À]§O³]©w³o­ÓKoha¦øªA¾¹©Ò­t³dªº¦UÀ]
     
    book fund¥Î¥HÁʸm®ÑÂǪº¦UºØ¸êª÷
     
    ! ! ! *************** *** 38,42 **** ! --- 38,42 ---- ! *************** *** 47,52 **** ! ! --- 47,52 ---- ! ! *************** *** 110,115 **** ! ! ! ! ! ! --- 128,133 ---- ! ! *************** *** 135,142 ****
    ­nKoha¯à¥¿±`¹B§@¡A½Ð±z°È¥²¨Ì¦¸°µ¦n¤U¦Cªº¦U¶µ³]©w
    À]§O³]©w³]©w³o­ÓKoha¦øªA¾¹©Ò­t³dªº¦UÀ]ªº¸ê®Æ
     
    book fund³]©w¥Î¥HÁʸm®ÑÂǪº¦UºØ¸êª÷
     
    »@´Ú³]©w¦UÃþŪªÌ­É¥X¦UÃþ¹Ï®Ñ¸ê®Æªº¦UºØ»@´Ú
     
    »@´Ú³]©w³]©w¦UÃþŪªÌ­É¥X¦UÃþ¹Ï®Ñ¸ê®Æªº¦UºØ»@´Ú
     
     
    ThesaurusManagement of thesaurus and authorities files.
     
     
    ThesaurusManagement of thesaurus and authorities files.
     
    ¤W¸ü¾÷Ū®æ¦¡°O¿ý¦Ü¡uBreeding Farm¡vThe breeding farm is a table where imported MARC records are stored.
    A MARC record is stored in the breeding farm as long as --- 110,115 ----
    ¤W¸ü¾÷Ū®æ¦¡°O¿ý¦Ü¡uBreeding Farm¡vThe breeding farm is a table where imported MARC records are stored.
    A MARC record is stored in the breeding farm as long as From acli at users.sourceforge.net Tue Feb 10 04:13:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:13:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.26,1.27 systempreferences.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32491/parameters Modified Files: admin-home.tmpl systempreferences.tmpl Log Message: Various pedantic SGML syntax corrections (e.g., must contain a multiple of 4 hyphens) Inserted some blank rows in admin-home for visual consistency. Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** admin-home.tmpl 10 Feb 2004 00:58:49 -0000 1.26 --- admin-home.tmpl 10 Feb 2004 03:13:41 -0000 1.27 *************** *** 2,12 ****

    Parameters


    !
    System parameters
    ! --- 2,14 ----

    Parameters


    !
    Fill those tables in the order they appear to get a working Koha
    Library branches
    System parameters
    ! ! + *************** *** 18,21 **** --- 20,24 ---- + *************** *** 27,34 **** --- 30,39 ---- + + *************** *** 40,68 **** --- 45,84 ---- + + + + + + + + + + + *************** *** 75,90 ****
    Fill those tables in the order they appear to get a working Koha
    Library branchesBook fund administration. Remember to edit your book funds before you start editing the budgets.
     
    CurrenciesDefine item types.
     
    Borrower categories Define the categories of borrowers.
     
    ChargesDefine categories and authorised values for them. Authorised values are used in MARC form to limit/help editing MARC biblios.
     
    Thesaurus Management of thesaurus and authorities files.
     
    MARC tag structure MARC structure: tags then subfields.
     
    Links Koha - MARC DB Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.
     
    MARC Check Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!
     
    Various parameters
     
    Printers Printers (UNIX paths).
     
    Stop words Words deleted during searches.
     
    Z39.50 Servers
    !
    Tools
    ! --- 91,110 ----
    Export
    MARC biblio export Exporting in MARC format.
    Import
    Upload MARC records in Breeding Farm
    !
    Tools
    ! ! + + + Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** systempreferences.tmpl 9 Dec 2003 10:29:02 -0000 1.18 --- systempreferences.tmpl 10 Feb 2004 03:13:41 -0000 1.19 *************** *** 56,60 **** !

    Modify a system preference

    --- 56,60 ---- !

    Modify a system preference

    *************** *** 78,82 **** ! Data recorded --- 78,82 ---- ! Data recorded *************** *** 86,90 **** !
    Export
    MARC biblio export Exporting in MARC format.
    Import
    Upload MARC records in Breeding Farm
    --- 86,90 ---- !
    *************** *** 101,105 **** ! Data deleted --- 101,105 ---- ! Data deleted *************** *** 108,112 **** !

    System preferences admin

    --- 108,112 ---- !

    System preferences admin

    From acli at users.sourceforge.net Tue Feb 10 04:13:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:13:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes parameters-top.inc,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32491/includes Modified Files: parameters-top.inc Log Message: Various pedantic SGML syntax corrections (e.g., must contain a multiple of 4 hyphens) Inserted some blank rows in admin-home for visual consistency. Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** parameters-top.inc 9 Dec 2003 10:29:04 -0000 1.18 --- parameters-top.inc 10 Feb 2004 03:13:41 -0000 1.19 *************** *** 35,39 **** !
    Value
    ½T©w­n²¾°£¶Ü¡H
    *************** *** 102,106 **** ! ¦¨¥\§R°£°Ñ¼Æ
    --- 102,106 ---- ! ¦¨¥\²¾°£°Ñ¼Æ *************** *** 128,133 ****
    		">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    §ó§ï    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    §R°£
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ­×§ï    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ²¾°£
    ! ! !
    --- 135,142 ----
    ! ! !
    From acli at users.sourceforge.net Tue Feb 10 05:57:22 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:57:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7,1.7.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19110 Modified Files: Tag: rel_2_0 about-top.inc Log Message: Spurious attribute in BODY removed Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** about-top.inc 9 Dec 2003 10:29:03 -0000 1.7 --- about-top.inc 10 Feb 2004 04:57:12 -0000 1.7.2.1 *************** *** 7,11 **** ! --- 7,11 ---- ! From acli at users.sourceforge.net Tue Feb 10 05:57:30 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:57:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19203/includes Modified Files: about-top.inc Log Message: Spurious attribute in BODY removed Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** about-top.inc 9 Dec 2003 10:29:03 -0000 1.7 --- about-top.inc 10 Feb 2004 04:57:27 -0000 1.8 *************** *** 7,11 **** ! --- 7,11 ---- ! From acli at users.sourceforge.net Tue Feb 10 05:59:04 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:59:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19434 Modified Files: Tag: rel_2_0 about-top.inc Log Message: Pedantic SGML syntax correction Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** about-top.inc 10 Feb 2004 04:57:12 -0000 1.7.2.1 --- about-top.inc 10 Feb 2004 04:59:01 -0000 1.7.2.2 *************** *** 33,37 **** ! !
    --- 33,37 ----
    !
    From acli at users.sourceforge.net Tue Feb 10 05:59:12 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:59:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19568/includes Modified Files: about-top.inc Log Message: Pedantic SGML syntax correction Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** about-top.inc 10 Feb 2004 04:57:27 -0000 1.8 --- about-top.inc 10 Feb 2004 04:59:09 -0000 1.9 *************** *** 33,37 ****
    ! ! ! --- 128,133 ---- ! ! *************** *** 135,142 ****
    --- 33,37 ----
    ! !
    From acli at users.sourceforge.net Tue Feb 10 06:52:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:52:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27584/includes Modified Files: common-style.css Log Message: This makes the fonts look more like the English version Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** common-style.css 10 Feb 2004 02:55:01 -0000 1.3 --- common-style.css 10 Feb 2004 05:51:58 -0000 1.4 *************** *** 197,198 **** --- 197,210 ---- font-weight: bold; } + + /* Chinese-specific stuff below */ + *[lang=en], *[lang=fr], *[lang=de], *[lang=it], + *[lang=mi], *[lang=nl], *[lang=pl], + *.en { + font-family: Helvetica, Arial, sans-serif; + } + + body { + font-family: "Apple LiGothic Medium", "SimHei", "MS Gothic", "MS Hei", sans-serif; + } + From acli at users.sourceforge.net Tue Feb 10 06:56:35 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:56:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW about.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28094 Added Files: about.tmpl Log Message: New "About" templates from en Minor visual improvements to parameters-{top,bottom}.inc --- NEW FILE ---

    ¦³Ãö³o­ÓKohaª©¥»ªº¸ê®Æ (¥H«K³ø§i¿ù»~¡A¥H¤Î¨ä¥L¦³¥Îªº¸ê°T)¡G

    Kohaª©¥»¡G
    ¾Þ§@¨t²Îª©¥» (uname -a)¡G
    Perlª©¥»¡G
    MySQLª©¥»¡G
    Apacheª©¥»¡G
    »ïÁ¡G

    ¥D­n¤H­û

    ¦uÅ@ªÌ Pat Eyler
    2.0ª©¥Xª©¥D¥ô­Ý¾÷Ū®æ¦¡¶}µoªÌ Paul Poulain
    ¾÷Ū®æ¦¡¥\¯à¿Ä¸ê Joshua Ferraro ¤Î Nelsonville ¥«¥ß¹Ï®ÑÀ]
    ¦­´Á¾÷Ū®æ¦¡¶}µoªÌ¡BVirtual Bookshelf·§©À¡BKohaCD Steve Tonnesen
    »¡©ú®Ñ½s¿è Nicholas Rosasco¡BMike Hansen
    «~½èºÞ²z­Ý¦w¸Ë/¤É¯Åµ{¦¡½s¼gªÌ MJ Ray ¤Î Turo Technology LLP
    ªk¤åĶªÌ Nicolas Morin
    		 Horowhenua Library Trust
    ¹Ï®ÑÀ]Á`ªø Rosalie Blake
    Jo Ransom
    Katipo Communications
    Á`¸g²z­Ýºô¯¸ºÞ²z­û Rachel Hamilton-Williams
    1.2ª©¥Xª©¥D¥ô Chris Cormack
    ¥H¤Î¡GSimon Blake¡B¹B§@¸g²zAmanda Atkins¡BOlwen Williams¡BFinlay Thompson¡BGynn Lomax¡BRichard Anderson¡BJeremy Blake¡BRebecca Holden¡BOlive T. Canine

    ¨ó§U

    Adam Thick
    Andrew Hooper
    Al Banks
    Ambrose Li
    Andrew Arensburger
    Benedykt P. Barszcz (2.0ª©ªiÄõ¤åĶªÌ)
    Brig C. McCoy
    Daniel Holth
    David Strainchamps
    Dorian Meid
    		 Ed Summers
    Florian Bischof
    Francisco M. Marzoa Alonso
    Glen Stewart
    Henri-Damien Laurent
    Jérome Vizcaino (ESIEE¾Ç°|)
    Kip DeGraaf
    Marco Gaiarin
    Md. Aftabuddin
    Michaes Herman
    		 Michel Lerenard (ESIEE¾Ç°|)
    Mike Johnson
    Mike Mylonas
    Pierre Cauchois (ESIEE¾Ç°|)
    Pawel Skuza (1.2ª©ªiÄõ¤åĶªÌ)
    Regula Sebastiao
    Roger Buck
    Ron Wickersham
    Sebastiaan Durand
    From acli at users.sourceforge.net Tue Feb 10 06:56:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:56:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,NONE,1.1 about-top.inc,NONE,1.1 parameters-bottom.inc,1.3,1.4 parameters-top.inc,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28094/includes Modified Files: parameters-bottom.inc parameters-top.inc Added Files: about-bottom.inc about-top.inc Log Message: New "About" templates from en Minor visual improvements to parameters-{top,bottom}.inc --- NEW FILE ---

     

    ªð¦^¥D­¶ || À]Âìd¸ß || ŪªÌ±b¤á || ®ÑÂÇÁʸm || ¬y³qªA°È || ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || Ãö©óKoha || ½u¤W»¡©ú
    --- NEW FILE --- KOHA: INTRANET: Parameters /includes/common-style.css">

    ¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

    µn¤JKoha

    Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** parameters-bottom.inc 10 Feb 2004 03:00:50 -0000 1.3 --- parameters-bottom.inc 10 Feb 2004 05:56:33 -0000 1.4 *************** *** 15,19 **** ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! Help --- 15,19 ---- ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! ½u¤W»¡©ú Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** parameters-top.inc 10 Feb 2004 03:19:52 -0000 1.5 --- parameters-top.inc 10 Feb 2004 05:56:33 -0000 1.6 *************** *** 7,15 **** /includes/common-style.css"> - + + *************** *** 87,91 ****
    !

    ¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

    µn¤JKoha

    --- 90,94 ----
    !

    ¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

    µn¤JKoha

    From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters systempreferences.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511/parameters Modified Files: Tag: rel_2_0 systempreferences.tmpl Log Message: Backport from trunk Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/systempreferences.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** systempreferences.tmpl 10 Feb 2004 04:22:01 -0000 1.3.2.1 --- systempreferences.tmpl 10 Feb 2004 05:57:14 -0000 1.3.2.2 *************** *** 58,62 **** !

    §ó§ï¨t²Î°¾¦n

    ·s¼W¨t²Î°¾¦n

    --- 58,62 ---- !

    ­×§ï¨t²Î°¾¦n

    ·s¼W¨t²Î°¾¦n

    *************** *** 94,98 ****
    !
    Value
    ¯uªº­n§R°£¡H
    --- 94,98 ----
    Value
    ½T©w­n²¾°£¶Ü¡H
    *************** *** 102,106 **** ! ¦¨¥\§R°£°Ñ¼Æ
    --- 102,106 ---- ! ¦¨¥\²¾°£°Ñ¼Æ *************** *** 128,133 ****
    		">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    §ó§ï    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    §R°£
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ­×§ï    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ²¾°£
    ! ! !
    --- 135,142 ----
    ! ! !
    From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW about.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511 Added Files: Tag: rel_2_0 about.tmpl Log Message: Backport from trunk --- NEW FILE ---

    ¦³Ãö³o­ÓKohaª©¥»ªº¸ê®Æ (¥H«K³ø§i¿ù»~¡A¥H¤Î¨ä¥L¦³¥Îªº¸ê°T)¡G

    Kohaª©¥»¡G
    ¾Þ§@¨t²Îª©¥» (uname -a)¡G
    Perlª©¥»¡G
    MySQLª©¥»¡G
    Apacheª©¥»¡G
    »ïÁ¡G

    ¥D­n¤H­û

    ¦uÅ@ªÌ Pat Eyler
    2.0ª©¥Xª©¥D¥ô­Ý¾÷Ū®æ¦¡¶}µoªÌ Paul Poulain
    ¾÷Ū®æ¦¡¥\¯à¿Ä¸ê Joshua Ferraro ¤Î Nelsonville ¥«¥ß¹Ï®ÑÀ]
    ¦­´Á¾÷Ū®æ¦¡¶}µoªÌ¡BVirtual Bookshelf·§©À¡BKohaCD Steve Tonnesen
    »¡©ú®Ñ½s¿è Nicholas Rosasco¡BMike Hansen
    «~½èºÞ²z­Ý¦w¸Ë/¤É¯Åµ{¦¡½s¼gªÌ MJ Ray ¤Î Turo Technology LLP
    ªk¤åĶªÌ Nicolas Morin
    		 Horowhenua Library Trust
    ¹Ï®ÑÀ]Á`ªø Rosalie Blake
    Jo Ransom
    Katipo Communications
    Á`¸g²z­Ýºô¯¸ºÞ²z­û Rachel Hamilton-Williams
    1.2ª©¥Xª©¥D¥ô Chris Cormack
    ¥H¤Î¡GSimon Blake¡B¹B§@¸g²zAmanda Atkins¡BOlwen Williams¡BFinlay Thompson¡BGynn Lomax¡BRichard Anderson¡BJeremy Blake¡BRebecca Holden¡BOlive T. Canine

    ¨ó§U

    Adam Thick
    Andrew Hooper
    Al Banks
    Ambrose Li
    Andrew Arensburger
    Benedykt P. Barszcz (2.0ª©ªiÄõ¤åĶªÌ)
    Brig C. McCoy
    Daniel Holth
    David Strainchamps
    Dorian Meid
    		 Ed Summers
    Florian Bischof
    Francisco M. Marzoa Alonso
    Glen Stewart
    Henri-Damien Laurent
    Jérome Vizcaino (ESIEE¾Ç°|)
    Kip DeGraaf
    Marco Gaiarin
    Md. Aftabuddin
    Michaes Herman
    		 Michel Lerenard (ESIEE¾Ç°|)
    Mike Johnson
    Mike Mylonas
    Pierre Cauchois (ESIEE¾Ç°|)
    Pawel Skuza (1.2ª©ªiÄõ¤åĶªÌ)
    Regula Sebastiao
    Roger Buck
    Ron Wickersham
    Sebastiaan Durand
    From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,NONE,1.1.2.1 about-top.inc,NONE,1.1.2.1 common-style.css,1.1.2.1,1.1.2.2 parameters-bottom.inc,1.2.2.1,1.2.2.2 parameters-top.inc,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511/includes Modified Files: Tag: rel_2_0 common-style.css parameters-bottom.inc parameters-top.inc Added Files: Tag: rel_2_0 about-bottom.inc about-top.inc Log Message: Backport from trunk --- NEW FILE ---

     

    ªð¦^¥D­¶ || À]Âìd¸ß || ŪªÌ±b¤á || ®ÑÂÇÁʸm || ¬y³qªA°È || ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || Ãö©óKoha || ½u¤W»¡©ú
    --- NEW FILE --- KOHA: INTRANET: Parameters /includes/common-style.css">

    ¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

    µn¤JKoha

    Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** common-style.css 10 Feb 2004 04:18:48 -0000 1.1.2.1 --- common-style.css 10 Feb 2004 05:57:14 -0000 1.1.2.2 *************** *** 197,198 **** --- 197,210 ---- font-weight: bold; } + + /* Chinese-specific stuff below */ + *[lang=en], *[lang=fr], *[lang=de], *[lang=it], + *[lang=mi], *[lang=nl], *[lang=pl], + *.en { + font-family: Helvetica, Arial, sans-serif; + } + + body { + font-family: "Apple LiGothic Medium", "SimHei", "MS Gothic", "MS Hei", sans-serif; + } + Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** parameters-bottom.inc 10 Feb 2004 04:18:48 -0000 1.2.2.1 --- parameters-bottom.inc 10 Feb 2004 05:57:14 -0000 1.2.2.2 *************** *** 15,19 **** ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! Help --- 15,19 ---- ¨t²Î°Ñ¼Æ || Ãö©óKoha || ! ½u¤W»¡©ú Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** parameters-top.inc 10 Feb 2004 04:18:48 -0000 1.3.2.1 --- parameters-top.inc 10 Feb 2004 05:57:14 -0000 1.3.2.2 *************** *** 7,15 **** /includes/common-style.css"> - + + *************** *** 87,91 ****
    !

    ¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

    µn¤JKoha

    --- 90,94 ----
    !

    ¨Ï¥ÎªÌ¨­¤À¡G [µn¥X]

    µn¤JKoha

    From acli at users.sourceforge.net Tue Feb 10 06:58:47 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:58:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,1.1,1.2 parameters-bottom.inc,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28725/includes Modified Files: about-bottom.inc parameters-bottom.inc Log Message: Markup error Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** about-bottom.inc 10 Feb 2004 05:56:33 -0000 1.1 --- about-bottom.inc 10 Feb 2004 05:58:45 -0000 1.2 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parameters-bottom.inc 10 Feb 2004 05:56:33 -0000 1.4 --- parameters-bottom.inc 10 Feb 2004 05:58:45 -0000 1.5 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú From acli at users.sourceforge.net Tue Feb 10 06:59:22 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:59:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,1.1.2.1,1.1.2.2 parameters-bottom.inc,1.2.2.2,1.2.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28817/includes Modified Files: Tag: rel_2_0 about-bottom.inc parameters-bottom.inc Log Message: Markup errors Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-bottom.inc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** about-bottom.inc 10 Feb 2004 05:57:14 -0000 1.1.2.1 --- about-bottom.inc 10 Feb 2004 05:59:20 -0000 1.1.2.2 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -r1.2.2.2 -r1.2.2.3 *** parameters-bottom.inc 10 Feb 2004 05:57:14 -0000 1.2.2.2 --- parameters-bottom.inc 10 Feb 2004 05:59:20 -0000 1.2.2.3 *************** *** 14,18 **** ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú --- 14,18 ---- ³øªí¦C¦L || ¨t²Î°Ñ¼Æ || ! Ãö©óKoha || ½u¤W»¡©ú From acli at users.sourceforge.net Tue Feb 10 07:08:37 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 22:08:37 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30242/parameters Modified Files: admin-home.tmpl Log Message: Minor updates Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** admin-home.tmpl 10 Feb 2004 03:08:00 -0000 1.5 --- admin-home.tmpl 10 Feb 2004 06:08:35 -0000 1.6 *************** *** 74,87 ****
    ! ! ! --- 74,87 ---- ! ! ! *************** *** 103,108 **** ! ! --- 103,108 ---- ! ! From acli at users.sourceforge.net Tue Feb 10 07:09:01 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 22:09:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30303/parameters Modified Files: Tag: rel_2_0 admin-home.tmpl Log Message: Backport from trunk Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** admin-home.tmpl 10 Feb 2004 04:22:01 -0000 1.3.2.1 --- admin-home.tmpl 10 Feb 2004 06:08:59 -0000 1.3.2.2 *************** *** 74,87 **** ! ! ! --- 74,87 ---- ! ! ! *************** *** 103,108 **** ! ! --- 103,108 ---- ! ! From acli at users.sourceforge.net Tue Feb 10 08:07:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:07:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes parameters-top.inc,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6302/includes Modified Files: parameters-top.inc Log Message: SGML syntax corrections Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** parameters-top.inc 10 Feb 2004 03:13:41 -0000 1.19 --- parameters-top.inc 10 Feb 2004 07:07:42 -0000 1.20 *************** *** 5,11 **** KOHA: INTRANET: Parameters /includes/common-style.css"> - - + + From acli at users.sourceforge.net Tue Feb 10 08:33:37 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:33:37 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters branches.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9857/parameters Modified Files: branches.tmpl Log Message: Sync to new en template Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branches.tmpl 10 Feb 2003 07:27:50 -0000 1.6 --- branches.tmpl 10 Feb 2004 07:33:35 -0000 1.7 *************** *** 1,115 **** ! ! !

    Logged in as: [Log out]

    ! !

    µn¤J Koha

    !     ! !
    ¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|)
     
    stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
     
    Z39.50 ¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
    ¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX¸ô®|)
     
    stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
     
    Z39.50¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
    MARC biblio export¥H¾÷Ū®æ¦¡¶×¥X
    ¶×¥X¾÷Ū®æ¦¡®Ñ¥Ø¥H¾÷Ū®æ¦¡¶×¥X®Ñ¥Ø
    ¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX ¸ô®|)
     
    stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
     
    Z39.50 ¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
    ¥´¦L¾÷³]©w¥´¦L¾÷ (UNIX¸ô®|)
     
    stopword ³]©w¬d¸ß®É©¿²¤­þ¨Ç¦r²´
     
    Z39.50¦øªA¾¹ ³]©w¬d¸ß¾÷Ū®æ¦¡¸ê®Æ®É¥Î­þ¨Ç¦øªA¾¹
    MARC biblio export¥H¾÷Ū®æ¦¡¶×¥X
    ¶×¥X¾÷Ū®æ¦¡®Ñ¥Ø¥H¾÷Ū®æ¦¡¶×¥X®Ñ¥Ø
    ! ! !
    ! ! ! ! ! ! ! ! ! ! !
    ¤ÀÀ]½s½X
    À]¦W"> 
    >
    ¦a§}
     
     
    ¹q¸Ü
    ¶Ç¯u
    ¹q¶l
     
    ! ! ! Confirm delete: !
    ! > !
    !
    !
    !     ! ! !
    ! !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]¤@Äý
    À]¦W½s½X¦a§}Ãþ§O 
    ! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
    ! !
    ! !
    ¹q¸Ü¡G     ! !
    ¶Ç¯u¡G     ! !
    ¹q¶l¡G     !     !     		! ! (¨S¦³³]©wÃþ§O) ! ! !
    !     !     !     		!
    ! ! ! !
    !
    ! ! !
    !
    !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]Ãþ§O
    Ãþ§O½s½X»¡©ú
    !     ! --- 1,232 ---- ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ¤ÀÀ]½s½X ! ! ! ! ! ! !
    À]¦W"> 
    !
    >
    ¦a§}
     
     
    ¹q¸Ü
    ¶Ç¯u
    ¹q¶l
     
    ! ! ! ½T©w­n²¾°£¶Ü¡H !
    ! ! > ! !
    !
    ! !
    ! ! ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]¤@Äý !
    À]¦W½s½X¦a§}Ãþ§O  
    ! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
    ! !
    ! !
    ¹q¸Ü¡G ! !
    ¶Ç¯u¡G ! !
    ¹q¶l¡G ! !     		! ! (¨S¦³³]©wÃþ§O) ! ! !
    ! ! !     		!
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]Ãþ§O !
    Ãþ§O½s½X»¡©ú  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Ãþ§O½s½X ! ! ! ! ! ! !
    ¦WºÙ"> 
    »¡©ú"> 
    !
    ! ! ! ! ½T©w­n²¾°£¶Ü¡H !
    ! ! ! !
    !
    ! !
    ! ! From acli at users.sourceforge.net Tue Feb 10 08:33:59 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:33:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters branches.tmpl,1.6,1.6.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9925/parameters Modified Files: Tag: rel_2_0 branches.tmpl Log Message: Backport from trunk Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** branches.tmpl 10 Feb 2003 07:27:50 -0000 1.6 --- branches.tmpl 10 Feb 2004 07:33:56 -0000 1.6.2.1 *************** *** 1,115 **** ! ! !

    Logged in as: [Log out]

    ! !

    µn¤J Koha

    !     ! !
    ! ! !
    ! ! ! ! ! ! ! ! ! ! !
    ¤ÀÀ]½s½X
    À]¦W"> 
    >
    ¦a§}
     
     
    ¹q¸Ü
    ¶Ç¯u
    ¹q¶l
     
    !     ! ! Confirm delete: !
    ! > !
    !
    !
    !     ! ! !
    ! !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]¤@Äý
    À]¦W½s½X¦a§}Ãþ§O 
    ! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
    ! !
    ! !
    ¹q¸Ü¡G     ! !
    ¶Ç¯u¡G     ! !
    ¹q¶l¡G     !     !     		! ! (¨S¦³³]©wÃþ§O) ! ! !
    !     !     !     		!
    ! ! ! !
    !
    ! ! !
    !
    !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]Ãþ§O
    Ãþ§O½s½X»¡©ú
    !     ! --- 1,232 ---- ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ¤ÀÀ]½s½X ! ! ! ! ! ! !
    À]¦W"> 
    !
    >
    ¦a§}
     
     
    ¹q¸Ü
    ¶Ç¯u
    ¹q¶l
     
    ! ! ! ½T©w­n²¾°£¶Ü¡H !
    ! ! > ! !
    !
    ! !
    ! ! ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]¤@Äý !
    À]¦W½s½X¦a§}Ãþ§O  
    ! ! (¨S¦³¿é¤J¦a§}) ! ! ! ! !
    ! !
    ! !
    ¹q¸Ü¡G ! !
    ¶Ç¯u¡G ! !
    ¹q¶l¡G ! !     		! ! (¨S¦³³]©wÃþ§O) ! ! !
    ! ! !     		!
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ¤ÀÀ]Ãþ§O !
    Ãþ§O½s½X»¡©ú  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Ãþ§O½s½X ! ! ! ! ! ! !
    ¦WºÙ"> 
    »¡©ú"> 
    !
    ! ! ! ! ½T©w­n²¾°£¶Ü¡H !
    ! ! ! !
    !
    ! !
    ! ! From acli at users.sourceforge.net Tue Feb 10 08:39:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:39:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.20,1.21 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10628/parameters Modified Files: systempreferences.tmpl Log Message: $script_name in template causes runtime error. Should be a TMPL_VAR Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** systempreferences.tmpl 10 Feb 2004 03:26:06 -0000 1.20 --- systempreferences.tmpl 10 Feb 2004 07:38:57 -0000 1.21 *************** *** 95,99 ****
    CONFIRM DELETION
    --- 95,99 ----
    CONFIRM DELETION !
    From acli at users.sourceforge.net Tue Feb 10 08:39:03 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:39:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.18.2.2,1.18.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10622/parameters Modified Files: Tag: rel_2_0 systempreferences.tmpl Log Message: $script_name in template causes runtime error. Should be a TMPL_VAR Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -C2 -r1.18.2.2 -r1.18.2.3 *** systempreferences.tmpl 10 Feb 2004 04:16:06 -0000 1.18.2.2 --- systempreferences.tmpl 10 Feb 2004 07:39:01 -0000 1.18.2.3 *************** *** 95,99 ****
    CONFIRM DELETION !
    --- 95,99 ----
    CONFIRM DELETION !
    From acli at users.sourceforge.net Tue Feb 10 08:54:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.3.2.2,1.3.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12907/includes Modified Files: Tag: rel_2_0 parameters-top.inc Log Message: SGML syntax correction Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** parameters-top.inc 10 Feb 2004 05:57:14 -0000 1.3.2.2 --- parameters-top.inc 10 Feb 2004 07:53:58 -0000 1.3.2.3 *************** *** 6,10 **** /includes/common-style.css"> - ! ! --- 26,31 ---- } ! ! From acli at users.sourceforge.net Tue Feb 10 08:54:20 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13009/includes Modified Files: parameters-top.inc Log Message: SGML syntax correction Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** parameters-top.inc 10 Feb 2004 05:56:33 -0000 1.6 --- parameters-top.inc 10 Feb 2004 07:54:16 -0000 1.7 *************** *** 6,10 **** /includes/common-style.css"> - ! ! --- 26,31 ---- } ! ! From acli at users.sourceforge.net Tue Feb 10 08:54:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13085/parameters Added Files: currency.tmpl Log Message: New file from en --- NEW FILE ---

    ­×§ï³f¹ô¶×²v

    ·s¼W³f¹ô¶×²v

    ³f¹ô
    ³f¹ô
    ¶×²v
    ¦¨¥\¼g¤J¸ê®Æ
    ³f¹ô
    ¶×²v
    ³o­Ó°O¿ý¤w³Q¨Ï¥Î¦¸¡A¤£¥i²¾°£¡C
    ½T©w­n²¾°£¶Ü¡H
    ¦¨¥\²¾°£¸ê®Æ

    ³f¹ô¶×²v³]©w

    >
    ±z¬d¸ß
    ³f¹ô ¶×²v
    ­×§ï ²¾°£
    << ¤W¤@­¶        ¤U¤@­¶ >>

    From acli at users.sourceforge.net Tue Feb 10 08:54:51 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13122/parameters Added Files: Tag: rel_2_0 currency.tmpl Log Message: New file from en --- NEW FILE ---

    ­×§ï³f¹ô¶×²v

    ·s¼W³f¹ô¶×²v

    ³f¹ô
    ³f¹ô
    ¶×²v
    ¦¨¥\¼g¤J¸ê®Æ
    ³f¹ô
    ¶×²v
    ³o­Ó°O¿ý¤w³Q¨Ï¥Î¦¸¡A¤£¥i²¾°£¡C
    ½T©w­n²¾°£¶Ü¡H
    ¦¨¥\²¾°£¸ê®Æ

    ³f¹ô¶×²v³]©w

    >
    ±z¬d¸ß
    ³f¹ô ¶×²v
    ­×§ï ²¾°£
    << ¤W¤@­¶        ¤U¤@­¶ >>

    From acli at users.sourceforge.net Tue Feb 10 09:02:31 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:02:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14491/parameters Modified Files: currency.tmpl Log Message: This is more consistent Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** currency.tmpl 10 Feb 2004 07:54:36 -0000 1.1 --- currency.tmpl 10 Feb 2004 08:02:25 -0000 1.2 *************** *** 57,63 **** !

    ­×§ï³f¹ô¶×²v

    !

    ·s¼W³f¹ô¶×²v

    --- 57,63 ---- !

    ­×§ï³f¹ô

    !

    ·s¼W³f¹ô

    *************** *** 161,165 **** !

    ³f¹ô¶×²v³]©w

    > --- 161,165 ---- !

    ³f¹ô¶×²v

    > From acli at users.sourceforge.net Tue Feb 10 09:02:49 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:02:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14543/parameters Modified Files: Tag: rel_2_0 currency.tmpl Log Message: This is more consistent Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** currency.tmpl 10 Feb 2004 07:54:49 -0000 1.1.2.1 --- currency.tmpl 10 Feb 2004 08:02:40 -0000 1.1.2.2 *************** *** 57,63 **** !

    ­×§ï³f¹ô¶×²v

    !

    ·s¼W³f¹ô¶×²v

    --- 57,63 ---- !

    ­×§ï³f¹ô

    !

    ·s¼W³f¹ô

    *************** *** 161,165 **** !

    ³f¹ô¶×²v³]©w

    > --- 161,165 ---- !

    ³f¹ô¶×²v

    > From acli at users.sourceforge.net Tue Feb 10 09:22:28 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:22:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters aqbookfund.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17489/parameters Modified Files: aqbookfund.tmpl Log Message: Sync to en, not yet translated Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbookfund.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** aqbookfund.tmpl 5 Feb 2003 05:03:18 -0000 1.2 --- aqbookfund.tmpl 10 Feb 2004 08:22:24 -0000 1.3 *************** *** 1,34 **** ! ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    !     ! ! ! bookfund admin method=post> ! !
    You Searched for


    ! ! ! ! ! " ! ! ! ! ! ! ! !
    Book fundNameGroupBudget     
      ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  
    !

          


     

    !     ! !

    !
    ! ! ! ! ! !
    Book fund>
    Book fund
    Name 
    Group
     
    !     ! ! data recorded !
    !     ! ! ! ! !

     

    ! ! ! data deleted !
    ! "" !     ! --- 101,143 ---- } !

    !
    Book fund
    Name
    Group
    CONFIRM DELETION
    ! ! ! ! !
    Book fund>
    Book fund
    Name 
     
    ! ! ! Data recorded !
    ! ! ! ! ! !

     

    ! ! ! Data deleted ! ! ! ! From acli at users.sourceforge.net Tue Feb 10 09:22:43 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:22:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters aqbookfund.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17553/parameters Modified Files: Tag: rel_2_0 aqbookfund.tmpl Log Message: Sync to en, not yet translated Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbookfund.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** aqbookfund.tmpl 5 Feb 2003 05:03:18 -0000 1.2 --- aqbookfund.tmpl 10 Feb 2004 08:22:41 -0000 1.2.2.1 *************** *** 1,34 **** ! ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    !     ! ! ! bookfund admin
    method=post> ! !
    You Searched for


    ! !

    Book fund
    Name
    CONFIRM DELETION
    ! ! ! " ! ! ! ! ! ! ! !
    Book fundNameGroupBudget     
      ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  
    !
          


     

    !     ! !

    !
    ! ! ! ! ! !
    Book fund>
    Book fund
    Name 
    Group
     
    !     ! ! data recorded !
    !     ! ! ! ! !

     

    ! ! ! data deleted !
    ! "" !     ! --- 101,143 ---- } !

    !
    Book fund
    Name
    Group
    CONFIRM DELETION
    ! ! ! ! !
    Book fund>
    Book fund
    Name 
     
    ! ! ! Data recorded !
    ! ! ! ! ! !

     

    ! ! ! Data deleted ! ! ! ! From acli at users.sourceforge.net Tue Feb 10 09:36:15 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:36:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters itemtypes.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20054/parameters Modified Files: itemtypes.tmpl Log Message: Sync to en template Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/itemtypes.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** itemtypes.tmpl 5 Feb 2003 04:44:18 -0000 1.2 --- itemtypes.tmpl 10 Feb 2004 08:36:13 -0000 1.3 *************** *** 1,3 **** ! ! ! !

    §ó§ïÀ]ÂÃÃþ§O

    ! !

    ¥[¤@À]ÂÃÃþ§O

    !     !
    Book fund
    Name
    CONFIRM DELETION
    ! ! ! ! ! ! ! ! ! ! ! ! !
    À]ÂÃÃþ§O>
    À]ÂÃÃþ§O
    »¡©ú 
    ¥i­É¦h¤[¡H¡]¥H¤é­p¡^
    ¥i§_Äò­É¡Hchecked value=1>
    ¶O¥Î
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    À]ÂÃÃþ§O
    »¡©ú
    ¥i­É¦h¤[ ¤é¤£¥i­É¥X
    ¥i§_Äò­É¥i¥HÄò­É¤£¥iÄò­É
    ¶O¥Î
    ³oºØÀ]ÂÃÃþ§O¦³¨t²Î¤º¤w¥X²{¤F ¦¸¡A¤£¥i§R°£¡C
    ¯uªº­n§R°£¶Ü¡H
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ½s½X ! »¡©ú¥i­É¦h¤[¥i§_Äò­É¶O¥Î  
    ¤é¤£¥i­É¥X¥i¥HÄò­É¤£¥iÄò­É?op=add_form&itemtype=">§ó§ï?op=delete_confirm&itemtype=">§R°£
    !
    !
    !     ! --- 60,162 ---- } ! ! !

    ­×§ïÀ]ÂÃÃþ§O

    ! !

    ·s¼WÀ]ÂÃÃþ§O

    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    À]ÂÃÃþ§O>
    À]ÂÃÃþ§O
    »¡©ú 
    ¥i­É¦h¤[ (¥H¤é­p)
    ¥i§_Äò­Échecked value=1>
    ­É¾\¶O¥Î
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    À]ÂÃÃþ§O
    »¡©ú
    ¥i­É¦h¤[¤é¤£¥i­É¥X
    ¥i§_Äò­É¥i¥HÄò­É¤£¥iÄò­É
    ­É¾\¶O¥Î
    ³o­Ó°O¿ý³Q¥Î¦¸¡A¤£¯à²¾°£¡C
    ½T©w­n²¾°£¶Ü¡H
    ! ! !

    ³]©wÀ]ÂÃÃþ§O

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ½s½X ! »¡©ú¥i­É¦h¤[¥i§_Äò­É­É¾\¶O¥Î­×§ï²¾°£
    ¥i¥HÄò­É¤£¥iÄò­É?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !
    !
    ! ! ! ! ! ! !
    ! ! //images/1leftarrow.png" title="¤W¤@­¶" ALT="¤W¤@­¶" BORDER=0>//images/1rightarrow.png" title="¤U¤@­¶" ALT="¤U¤@­¶" BORDER=0>
    ! ! From tipaul at users.sourceforge.net Tue Feb 10 10:02:56 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 01:02:56 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac-css.fr,1.1.2.4,1.1.2.5 translator_doc.txt,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24737/misc/translator Modified Files: Tag: rel_2_0 opac-css.fr translator_doc.txt Log Message: * updated french css opac * fixes in translator doc Index: opac-css.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/Attic/opac-css.fr,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -r1.1.2.4 -r1.1.2.5 *** opac-css.fr 26 Jan 2004 10:42:27 -0000 1.1.2.4 --- opac-css.fr 10 Feb 2004 09:02:53 -0000 1.1.2.5 *************** *** 12,18 **** Author Auteur Available Disponible ! barcode LIMITED:code barre ! Barcode LIMITED:Code barre ! BARCODE LIMITED:CODE BARRE Biblio number Notice biblio : Biblionumber Numéro notice : --- 12,18 ---- Author Auteur Available Disponible ! barcode LIMITED;code barre ! Barcode LIMITED;Code barre ! BARCODE LIMITED;CODE BARRE Biblio number Notice biblio : Biblionumber Numéro notice : *************** *** 79,83 **** Library Card Carte lecteur Loan Length Durée prêt ! Location LIMITED:Localisation location LIMITED;Localisation Log In S'identifier --- 79,83 ---- Library Card Carte lecteur Loan Length Durée prêt ! Location LIMITED;Localisation location LIMITED;Localisation Log In S'identifier *************** *** 135,139 **** Results through of records. résultats de à results found Réponses trouvées ! search LIMITED:chercher Search the catalogue Chercher dans le catalogue Sep Sep --- 135,139 ---- Results through of records. résultats de à results found Réponses trouvées ! search LIMITED;recherche Search the catalogue Chercher dans le catalogue Sep Sep Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** translator_doc.txt 16 Jan 2004 16:24:19 -0000 1.1.2.1 --- translator_doc.txt 10 Feb 2004 09:02:53 -0000 1.1.2.2 *************** *** 15,25 **** ============ 1- create your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & french being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version, go back to pt1 & repeat. WEAKNESSES --- 15,31 ---- ============ 1- create your translation file : ! ./tmpl_process.pl create -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images/css files in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version : ! 1- update your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate new your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) ! 3- create your translated version : ! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy new images/css files in your new directory if needed WEAKNESSES From tipaul at users.sourceforge.net Tue Feb 10 10:09:45 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 01:09:45 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.32.2.5,1.32.2.6 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26014/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.pl Log Message: small fix to handle tags<10 Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.32.2.5 retrieving revision 1.32.2.6 diff -C2 -r1.32.2.5 -r1.32.2.6 *** addbiblio.pl 6 Feb 2004 14:14:55 -0000 1.32.2.5 --- addbiblio.pl 10 Feb 2004 09:09:41 -0000 1.32.2.6 *************** *** 232,235 **** --- 232,236 ---- next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); + next if ($tag<10); next if (defined($record->field($tag)->subfield($subfield))); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 241,245 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); From acli at users.sourceforge.net Tue Feb 10 10:36:46 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:36:46 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31712 Modified Files: tmpl_process.pl Log Message: Arrays are always defined. We should check its length instead. Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** tmpl_process.pl 9 Feb 2004 23:34:08 -0000 1.6 --- tmpl_process.pl 10 Feb 2004 09:36:44 -0000 1.7 *************** *** 31,35 **** # Checks for missing input and string list arguments ! if( !defined(@in_files) || !defined($str_file) ) { usage("You must at least specify input and string list filenames."); --- 31,35 ---- # Checks for missing input and string list arguments ! if( !@in_files || !defined($str_file) ) { usage("You must at least specify input and string list filenames."); From acli at users.sourceforge.net Tue Feb 10 10:40:23 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:40:23 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32380 Modified Files: tmpl_process.pl Log Message: Minor correction in help text This handling for --help works too, and is less wordy Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** tmpl_process.pl 10 Feb 2004 09:36:44 -0000 1.7 --- tmpl_process.pl 10 Feb 2004 09:40:21 -0000 1.8 *************** *** 19,27 **** 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help, ) || (usage(), exit(-1)); - help() if $help; - # utiliser glob() pour tous les fichiers d'un repertoire --- 19,25 ---- 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => sub { help() }, ) || (usage(), exit(-1)); # utiliser glob() pour tous les fichiers d'un repertoire *************** *** 428,432 **** input files. ! -r or --recursive= Use the recursive mode to process every entry in subdirectories. Note: Symbolic links used to link directories are not supported. --- 426,430 ---- input files. ! -r or --recursive Use the recursive mode to process every entry in subdirectories. Note: Symbolic links used to link directories are not supported. From acli at users.sourceforge.net Tue Feb 10 10:42:20 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:42:20 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv581 Modified Files: tmpl_process.pl Log Message: exit(-1) after usage() is not needed Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** tmpl_process.pl 10 Feb 2004 09:40:21 -0000 1.8 --- tmpl_process.pl 10 Feb 2004 09:42:18 -0000 1.9 *************** *** 20,24 **** 'sep=s' => \$split_char, 'help' => sub { help() }, ! ) || (usage(), exit(-1)); # utiliser glob() pour tous les fichiers d'un repertoire --- 20,24 ---- 'sep=s' => \$split_char, 'help' => sub { help() }, ! ) || usage(); # utiliser glob() pour tous les fichiers d'un repertoire From tipaul at users.sourceforge.net Tue Feb 10 14:15:48 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:15:48 -0800 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.78.2.2,1.78.2.3 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10256/C4 Modified Files: Tag: rel_2_0 Biblio.pm Log Message: removing 2 warnings Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.78.2.2 retrieving revision 1.78.2.3 diff -C2 -r1.78.2.2 -r1.78.2.3 *** Biblio.pm 26 Jan 2004 10:38:06 -0000 1.78.2.2 --- Biblio.pm 10 Feb 2004 13:15:46 -0000 1.78.2.3 *************** *** 1558,1562 **** } $query =~ s/\,$//; - warn "Q 1560 : $query"; my $sth2=$dbh->prepare($query); $sth2->execute(@bind); --- 1558,1561 ---- *************** *** 1583,1587 **** #replacing the last , by ",?)" $query=~ s/\,$//; - warn "Q olddelbiblio : $query"; $sth=$dbh->prepare($query); $sth->execute(@bind); --- 1582,1585 ---- *************** *** 2194,2197 **** --- 2192,2198 ---- # $Id$ # $Log$ + # Revision 1.78.2.3 2004/02/10 13:15:46 tipaul + # removing 2 warnings + # # Revision 1.78.2.2 2004/01/26 10:38:06 tipaul # dealing correctly "bulk" field From tipaul at users.sourceforge.net Tue Feb 10 14:17:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.24.2.1,1.24.2.2 addbooks.tmpl,1.12,1.12.2.1 isbnsearch.tmpl,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10580/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.tmpl addbooks.tmpl isbnsearch.tmpl Log Message: bug fixes in HTML, and (addbiblio.tmpl), bugfix for bibliodeletion Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -C2 -r1.24.2.1 -r1.24.2.2 *** addbiblio.tmpl 26 Jan 2004 10:46:36 -0000 1.24.2.1 --- addbiblio.tmpl 10 Feb 2004 13:17:08 -0000 1.24.2.2 *************** *** 17,35 **** ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! z3950 search
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! ! ! ! ! z3950 search
    +   + + +
    >>>>
    +     +
    *************** *** 85,88 **** --- 100,115 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 110,113 **** --- 137,152 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 135,138 **** --- 174,189 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 160,163 **** --- 211,226 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 185,188 **** --- 248,263 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 210,213 **** --- 285,300 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 235,238 **** --- 322,337 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 260,263 **** --- 359,374 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 285,288 **** --- 396,404 ---- + + +
    <<<<
    +     + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** addbooks.tmpl 9 Dec 2003 10:29:06 -0000 1.12 --- addbooks.tmpl 10 Feb 2004 13:17:08 -0000 1.12.2.1 *************** *** 22,26 **** ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    --- 22,26 ---- ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    *************** *** 32,38 ****   ! Create Empty biblio ! Create Empty biblio --- 32,38 ----   ! Create Empty biblio ! Create Empty biblio *************** *** 52,56 **** Keyword: ! --- 52,56 ---- Keyword: ! Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** isbnsearch.tmpl 9 Dec 2003 10:29:07 -0000 1.11 --- isbnsearch.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 *************** *** 5,9 **** results found
    ! Results to displayed

    --- 5,9 ---- results found
    ! Results to displayed

    *************** *** 46,50 **** ! ">Add Items ">Edit... --- 46,50 ---- ! ">Add items ">Edit... From tipaul at users.sourceforge.net Tue Feb 10 14:17:11 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.7.2.1,1.7.2.2 basket.tmpl,1.7.2.2,1.7.2.3 newbasket2.tmpl,1.7,1.7.2.1 order.tmpl,1.11,1.11.2.1 recieve.tmpl,1.6,1.6.2.1 supplier.tmpl,1.8,1.8.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10580/koha-tmpl/intranet-tmpl/default/en/acqui Modified Files: Tag: rel_2_0 acquire.tmpl basket.tmpl newbasket2.tmpl order.tmpl recieve.tmpl supplier.tmpl Log Message: bug fixes in HTML, and (addbiblio.tmpl), bugfix for bibliodeletion Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** acquire.tmpl 13 Jan 2004 17:29:30 -0000 1.7.2.1 --- acquire.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.2 *************** *** 6,10 **** !

    Receipt Summary for: Invoice,

    --- 6,10 ---- !

    Receipt Summary for: Invoice

    Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -r1.7.2.2 -r1.7.2.3 *** basket.tmpl 26 Jan 2004 10:46:36 -0000 1.7.2.2 --- basket.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.3 *************** *** 2,6 ****

    Shopping Basket for >


    ! (Our Reference: , #, authorised by: )

    --- 2,6 ----

    Shopping Basket for >


    ! Our Reference: , # authorised by

    Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** newbasket2.tmpl 9 Dec 2003 10:29:08 -0000 1.7 --- newbasket2.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.1 *************** *** 30,34 **** results found. !
    Results to displayed. --- 30,34 ---- results found. !
    Results to displayed.
    Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** order.tmpl 9 Dec 2003 10:29:08 -0000 1.11 --- order.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 *************** *** 23,27 **** > > - - -
    ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > --- 23,31 ----
    ! ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > ! ! Inactive ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** recieve.tmpl 9 Dec 2003 10:29:08 -0000 1.6 --- recieve.tmpl 10 Feb 2004 13:17:08 -0000 1.6.2.1 *************** *** 6,10 **** !

    Receipt Summary for : , Invoice

    --- 6,10 ---- !

    Receipt Summary for : Invoice

    Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** supplier.tmpl 9 Dec 2003 10:29:08 -0000 1.8 --- supplier.tmpl 10 Feb 2004 13:17:08 -0000 1.8.2.1 *************** *** 85,91 ****
    /images/filesave.png" border=0 title="save" alt="save">
    --- 85,88 ---- *************** *** 96,101 **** Supplier is ! checked>Active ! checked>Inactive --- 93,104 ---- Supplier is ! ! ! Active ! Inactive ! ! Active ! Inactive ! *************** *** 153,157 **** !

    --- 156,161 ---- !
    !
    /images/filesave.png" border=0 title="save" alt="save" class="button">
    From tipaul at users.sourceforge.net Tue Feb 10 14:17:59 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue catalogue-home.tmpl,1.8.2.1,1.8.2.2 cmsdsearchresults.tmpl,1.2,1.2.2.1 detail-opac.tmpl,1.5,1.5.2.1 detail.tmpl,1.9.2.2,1.9.2.3 MARCdetail.tmpl,1.14,1.14.2.1 moredetail.tmpl,1.9,1.9.2.1 subject.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10744/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl subject.tmpl Log Message: HTML modifs to improve translation tool Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -r1.8.2.1 -r1.8.2.2 *** catalogue-home.tmpl 26 Jan 2004 10:46:35 -0000 1.8.2.1 --- catalogue-home.tmpl 10 Feb 2004 13:17:57 -0000 1.8.2.2 *************** *** 24,28 **** ! HELP
    --- 24,28 ---- ! HELP
    *************** *** 97,101 **** ! Virtual Bookshelves --- 97,101 ---- ! Virtual Bookshelves Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** cmsdsearchresults.tmpl 9 Dec 2003 10:29:05 -0000 1.2 --- cmsdsearchresults.tmpl 10 Feb 2004 13:17:57 -0000 1.2.2.1 *************** *** 24,28 ****
    ! Results through of records.
    --- 24,28 ----
    ! Results through of records.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** detail-opac.tmpl 9 Dec 2003 10:29:06 -0000 1.5 --- detail-opac.tmpl 10 Feb 2004 13:17:57 -0000 1.5.2.1 *************** *** 38,46 **** ! ! --- 38,46 ----
    Item Type Class Location Date DueLast Seen
    ! ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -r1.9.2.2 -r1.9.2.3 *** detail.tmpl 26 Jan 2004 10:46:35 -0000 1.9.2.2 --- detail.tmpl 10 Feb 2004 13:17:57 -0000 1.9.2.3 *************** *** 60,67 ****
    Item type Class Location Date DueLast seen
    ! ! --- 60,67 ----
    Item Type Location Date DueLast Seen Barcode Volume
    ! ! Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -r1.14 -r1.14.2.1 *** MARCdetail.tmpl 9 Dec 2003 10:29:06 -0000 1.14 --- MARCdetail.tmpl 10 Feb 2004 13:17:57 -0000 1.14.2.1 *************** *** 19,22 **** --- 19,23 ---- + *************** *** 257,263 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** moredetail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- moredetail.tmpl 10 Feb 2004 13:17:57 -0000 1.9.2.1 *************** *** 31,38 **** Biblionumber:
    ! Item Type:
    URL:
    ! Loan Length:
    ! Rental Charge:
    Classification:
    ISBN:
    --- 31,38 ---- Biblionumber:
    ! Item type:
    URL:
    ! Loan length:
    ! Rental charge:
    Classification:
    ISBN:
    Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** subject.tmpl 9 Dec 2003 10:29:06 -0000 1.4 --- subject.tmpl 10 Feb 2004 13:17:57 -0000 1.4.2.1 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 ****
    Item type Location Date DueLast seen Barcode Volume//images/edittrash.png"> ">Normal')">Print MARC biblio :
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Subject
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !
    !

    ! Results through of records.
    --- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subject
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Results through of records.
    From tipaul at users.sourceforge.net Tue Feb 10 14:19:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:19:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15.2.2,1.15.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: Tag: rel_2_0 circulation.tmpl Log Message: HTML modifs to improve translation tool Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15.2.2 retrieving revision 1.15.2.3 diff -C2 -r1.15.2.2 -r1.15.2.3 *** circulation.tmpl 29 Jan 2004 19:07:30 -0000 1.15.2.2 --- circulation.tmpl 10 Feb 2004 13:19:01 -0000 1.15.2.3 *************** *** 5,9 **** ! &branch=&printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &printer=&print=yes"> Next Borrower  *************** *** 14,24 **** !

    Circulation: Issues


    ! Branch:
    ! Printer:
    !     Change Settings "> "> -

     

    --- 14,21 ----
    !

    Circulation: Issues

    ! Branch: Printer: Change Settings "> "> *************** *** 38,42 **** Branch:
    Printer:
    ! Change Settings"> "> --- 35,39 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 141,145 ****
    ! --- 138,142 ----
    ! *************** *** 172,176 ****
    ! ! --- 13,17 ---- ! *************** *** 41,45 **** Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray et Turo Technology LLP, england (quality control, installer & updater)
    Nicolas Morin, Français Translation
    --- 41,45 ---- Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! 1
    Nicolas Morin, Français Translation
    *************** *** 65,69 **** Ambrose Li
    Andrew Arensburger
    ! Benedykt P. Barszcz (polish for 2.0)
    Brig C. McCoy
    Daniel Holth
    --- 65,69 ---- Ambrose Li
    Andrew Arensburger
    ! 1
    Brig C. McCoy
    Daniel Holth
    *************** *** 84,88 ****
    --- 169,173 ---- ! ! --- 184,188 ---- ! *************** *** 225,229 ****
    *************** *** 187,191 **** Item Barcode:
    Item Barcode:
    ! ! --- 93,104 ---- ! ! ! Actif ! Inactif ! *************** *** 153,157 ****
    Borrower information
    --- 222,226 ---- ! --- 260,264 ---- ! *************** *** 273,279 ****
    Borrower information
    *************** *** 263,267 **** !
    ODUESYes, See below
    ODUESYes, See below
    !



    !
    /images/background-mem.gif"> --- 270,276 ----
    !
    ! --- 90,100 ---- ! Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** common-style.css 4 Sep 2003 13:04:12 -0000 1.8 --- common-style.css 10 Feb 2004 13:19:21 -0000 1.8.2.1 *************** *** 2,8 **** text-align: center; font: 1.2em sans-serif; ! padding: 10px 15px; border-style: solid; ! border-width: 2px; border-color: black; text-decoration: none; --- 2,8 ---- text-align: center; font: 1.2em sans-serif; ! padding: 3px; border-style: solid; ! border-width: 1px; border-color: black; text-decoration: none; *************** *** 13,17 **** background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } - #problem { color: red; --- 13,16 ---- *************** *** 28,31 **** --- 27,36 ---- border-left:1px solid #000000; } + a { + text-decoration: none; + } + a:hover { + text-decoration: none; + } a.submenu { font-weight: normal; Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** issues-top.inc 9 Dec 2003 10:29:04 -0000 1.6 --- issues-top.inc 10 Feb 2004 13:19:21 -0000 1.6.2.1 *************** *** 172,176 **** ! ! --- 118,122 ---- ! From tipaul at users.sourceforge.net Tue Feb 10 14:54:18 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:54:18 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports reports-home.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19195/koha-tmpl/intranet-tmpl/default/en/reports Modified Files: Tag: rel_2_0 reports-home.tmpl Log Message: html fix for translation Index: reports-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** reports-home.tmpl 9 Dec 2003 10:28:59 -0000 1.4 --- reports-home.tmpl 10 Feb 2004 13:54:00 -0000 1.4.2.1 *************** *** 8,13 ****
    • Till Reconciliation: Daily Report (yesterday) !
    • Till Reconciliation: Daily ! Report (today)
    • Overdue items --- 8,12 ----
      • Till Reconciliation: Daily Report (yesterday) !
      • Till Reconciliation: Daily Report (today)
      • Overdue items From tipaul at users.sourceforge.net Tue Feb 10 15:05:41 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:05:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.3.2.3,1.3.2.4 acquire.tmpl,1.1.2.3,1.1.2.4 basket.tmpl,1.5.2.2,1.5.2.3 newbasket2.tmpl,1.4.2.3,1.4.2.4 newbasket.tmpl,1.1.2.2,1.1.2.3 newbiblio.tmpl,1.5.2.3,1.5.2.4 order.tmpl,1.3.2.1,1.3.2.2 recieve.tmpl,1.1.2.1,1.1.2.2 supplier.tmpl,1.4.2.3,1.4.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: Tag: rel_2_0 acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieve.tmpl supplier.tmpl Log Message: french translation fixes Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** acqui-home.tmpl 28 Jan 2004 16:44:20 -0000 1.3.2.3 --- acqui-home.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.4 *************** *** 54,58 ****
    ! --- 54,58 ---- ! *************** *** 72,76 **** ! --- 72,76 ---- ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** acquire.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- acquire.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 6,10 **** !

    Receipt Summary for: Facture,

    --- 6,10 ---- !

    Sommaire pour: Facture

    *************** *** 72,76 ****
    ! --- 72,76 ---- ! *************** *** 135,139 **** !

     

    --- 135,139 ---- !

     

    Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -r1.5.2.2 -r1.5.2.3 *** basket.tmpl 26 Jan 2004 10:47:58 -0000 1.5.2.2 --- basket.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.3 *************** *** 2,6 ****

    Panier pour >


    ! (Ref: , #, saisi par: )

    --- 2,6 ----

    Panier pour >


    ! Notre ref: , # validée par

    Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** newbasket2.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.3 --- newbasket2.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4 *************** *** 17,21 **** > Nouvelle recherche: !

    --- 17,21 ---- > Nouvelle recherche: !
    *************** *** 30,34 **** Résultats trouvés. !
    Résultats to displayed.
    /images/background-mem.gif"> From tipaul at users.sourceforge.net Tue Feb 10 14:19:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:19:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes cat-top.inc,1.18,1.18.2.1 common-style.css,1.8,1.8.2.1 issues-top.inc,1.6,1.6.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11030/koha-tmpl/intranet-tmpl/default/en/includes Modified Files: Tag: rel_2_0 cat-top.inc common-style.css issues-top.inc Log Message: HTML modifs to improve translation tool Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -r1.18 -r1.18.2.1 *** cat-top.inc 9 Dec 2003 10:29:04 -0000 1.18 --- cat-top.inc 10 Feb 2004 13:19:21 -0000 1.18.2.1 *************** *** 90,97 **** ! Add biblio ! Cat maintenance
    ! Virtual shelves ! Add biblio ! ! Cat maintenance
    TOTALYou have error(s) in your MARC configuration. Please fix them before using koha
    TOTALYou have error(s) in your MARC configuration. Please fix them before using koha
    Total DépenséComtd Disp.
    Total DépenséEngagé Disp.
    Volume Info (for serials) *
    Info Volume (pour périodiques) *
    --- 30,34 ---- Résultats trouvés. !
    Résultats to affiché.
    *************** *** 93,97 **** &offset=&type=&id=&basket=&search=&author="> ! Suivant --- 93,97 ---- &offset=&type=&id=&basket=&search=&author="> ! Next Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** newbasket.tmpl 26 Jan 2004 10:47:58 -0000 1.1.2.2 --- newbasket.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.3 *************** *** 2,6 ****

    Panier for


    ! (Ref: , #, saisi par: )
    Tél.: , Fax:
    ,
    --- 2,6 ----

    Panier for


    ! (Notre ref: , #, validée par: )
    Tél.: , Fax:
    ,
    Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** newbiblio.tmpl 28 Jan 2004 16:44:20 -0000 1.5.2.3 --- newbiblio.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.4 *************** *** 130,134 **** ! --- 130,134 ---- ! Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** order.tmpl 20 Jan 2004 09:09:16 -0000 1.3.2.1 --- order.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.2 *************** *** 23,30 **** > --- 23,34 ---- > Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** recieve.tmpl 20 Jan 2004 09:09:16 -0000 1.1.2.1 --- recieve.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 6,10 **** !

    Receipt Summary for : , Facture

    --- 6,10 ---- !

    Sommaire pour : Facture

    Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** supplier.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.3 --- supplier.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4 *************** *** 85,91 ****
    - - -
    Coûts budgetés
    (ex GST, inc discount)     		" onchange='mettre à jour(this.form)'>
    Coûts budgetés
    (ex TVA, remise)     		" onchange='mettre à jour(this.form)'>
    ! /images/mail_send.png" title="Ajouter order" ALT="Ajouter" BORDER=0 > ! /images/mail_get.png" title="receive" ALT="Ajouter" BORDER=0 >
    ! ! /images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 > ! ! Inactif ! ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 >
    /images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer">
    --- 85,88 ---- *************** *** 96,101 ****
    Le fournisseur estchecked>Active ! checked>Inactive
    Le fournisseur est ! ! Actif ! Inactif
    ! --- 156,161 ----
    !
    !
    /images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" class="button"> From tipaul at users.sourceforge.net Tue Feb 10 15:05:42 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:05:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.1.2.2,1.1.2.3 auth.tmpl,1.1.2.1,1.1.2.2 boraccount.tmpl,1.4.2.2,1.4.2.3 charges.tmpl,1.1.2.1,1.1.2.2 default.tmpl,1.1.2.3,1.1.2.4 intranet-main.tmpl,1.6.2.1,1.6.2.2 mancredit.tmpl,1.1.2.1,1.1.2.2 maninvoice.tmpl,1.1.2.3,1.1.2.4 member-flags.tmpl,1.1.2.1,1.1.2.2 modbibitem.tmpl,1.1.2.3,1.1.2.4 modbib.tmpl,1.2.2.3,1.2.2.4 newjmember.tmpl,1.1.2.3,1.1.2.4 newmember.tmpl,1.3.2.3,1.3.2.4 opac-main.tmpl,1.1.2.2,1.1.2.3 overdue.tmpl,1.1.2.1,1.1.2.2 request.tmpl,1.5.2.3,1.5.2.4 shelves.tmpl,1.1.2.2,1.1.2.3 thesaurus_popup.tmpl,1.3.2.2,1.3.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/default/fr Modified Files: Tag: rel_2_0 about.tmpl auth.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl member-flags.tmpl modbibitem.tmpl modbib.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl request.tmpl shelves.tmpl thesaurus_popup.tmpl Log Message: french translation fixes Index: about.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/about.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** about.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- about.tmpl 10 Feb 2004 14:05:38 -0000 1.1.2.3 *************** *** 13,17 ****
    OS version (from 'uname -a'):
    Version Système (uname -a):
    ! Michel Lerenard (Esiee Ecole)
    Mike Johnson
    Mike Mylonas
    --- 84,88 ----     		! 1
    Mike Johnson
    Mike Mylonas
    Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/auth.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** auth.tmpl 20 Jan 2004 09:14:25 -0000 1.1.2.1 --- auth.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 1,20 **** !

    Désolé, vous n'avez pas la permission d'accéder à cette page.

    !

    Sorry, your session has timed out. Please connecter again.

    !

    Vous avez changé d'adresse IP. Identifiez-vous à nouveau.

    !

    Vous entered an incorrect username ou password. Please try again.

    --- 1,20 ---- !

    Désolé, vous n'avez pas la permission d'accéder à cette page.

    !

    Sorry, your session has timed out. Please connecter again.

    !

    Vous avez changé d'adresse IP. Identifiez-vous à nouveau.

    !

    Vous entered an incorrect username ou password. Please try again.

    Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -r1.4.2.2 -r1.4.2.3 *** boraccount.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.2 --- boraccount.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.3 *************** *** 3,7 **** !

    Account for ">

    Créer une facture manuelle   --- 3,7 ---- !

    Compte pour ">

    Créer une facture manuelle   *************** *** 39,43 ****

    !

     

    --- 39,43 ----
    !

     

    Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** charges.tmpl 20 Jan 2004 09:14:53 -0000 1.1.2.1 --- charges.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 4,9 ****

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, son cycle
    ! eg 1,7,7 = $1 fine, after 7 days, every 7 days.

    --- 4,9 ----

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours.

    Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/default.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** default.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- default.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 16,22 ****
    ! &startfrom=>Précédents Records ! &startfrom=>Suivant Records
    --- 16,22 ----
    ! &startfrom=>Previous Records ! &startfrom=>Next Records
    *************** *** 24,28 ****
    ! Résultats à sur enregistrements.

    --- 24,28 ----
    ! Résultats à sur enregistrements.
    Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -r1.6.2.1 -r1.6.2.2 *** intranet-main.tmpl 20 Jan 2004 09:14:53 -0000 1.6.2.1 --- intranet-main.tmpl 10 Feb 2004 14:05:39 -0000 1.6.2.2 *************** *** 81,85 **** !
    Saisissez une valeur et pressez la touche Entrée..
    --- 81,85 ---- !
    Saisissez une valeur et pressez la touche Entrée..
    *************** *** 87,91 **** /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Advanced Search (More Options)
    --- 87,91 ---- /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Recherche avancée (plus d'options)
    *************** *** 110,114 **** !
    Saisissez une valeur et pressez la touche Entrée..
    /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0"> --- 110,114 ---- !
    Saisissez une valeur et pressez la touche Entrée..
    /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0"> Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** mancredit.tmpl 20 Jan 2004 09:14:53 -0000 1.1.2.1 --- mancredit.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 16,20 **** Description Montant ! --- 16,20 ---- Description Montant ! Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** maninvoice.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- maninvoice.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 19,23 **** Description Montant ! --- 19,23 ---- Description Montant ! Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/member-flags.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** member-flags.tmpl 20 Jan 2004 09:14:25 -0000 1.1.2.1 --- member-flags.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 23,27 ****

    ! --- 23,27 ----

    ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** modbibitem.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- modbibitem.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 24,28 **** ! Catég ouvrage" size=20> --- 24,28 ---- ! Catég ouvrage" size=20> *************** *** 68,72 **** ! CHANGES TO AFFECT THESE BARCODES
    Sélectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-sélectionnés ne seront pas affectés. --- 68,72 ---- ! MODIFS SUR CES CODES-BARRES
    Sélectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-sélectionnés ne seront pas affectés. *************** *** 101,105 **** AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some items, tick the appropriate ones et a new group record will be created automatically for them. !

     

    --- 101,105 ---- AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some items, tick the appropriate ones et a new group record will be created automatically for them. !

     

    Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** modbib.tmpl 28 Jan 2004 16:44:20 -0000 1.2.2.3 --- modbib.tmpl 10 Feb 2004 14:05:39 -0000 1.2.2.4 *************** *** 53,57 ****
    ! --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** searchresults.tmpl 28 Jan 2004 16:44:56 -0000 1.2.2.3 --- searchresults.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 66,70 **** ! &=&type=opacintra>Précédents Records   --- 66,70 ---- ! &=&type=opacintra>Previous Records   *************** *** 73,77 **** ! &=&type=opacintra>Suivant Records   --- 73,77 ---- ! &=&type=opacintra>Next Records   Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** subject.tmpl 28 Jan 2004 16:44:56 -0000 1.2.2.3 --- subject.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 **** ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Sujet
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Précédents Records ! ! &startfrom=>Suivant Records !
    !

    ! Résultats à sur enregistrements.
    --- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sujet
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Résultats à sur enregistrements.
    From tipaul at users.sourceforge.net Tue Feb 10 15:06:20 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes about-bottom.inc,1.2.2.1,1.2.2.2 about-top.inc,1.3.2.1,1.3.2.2 acquisitions-bottom.inc,1.4.2.1,1.4.2.2 cat-bottom.inc,1.4.2.1,1.4.2.2 cat-top.inc,1.12.2.1,1.12.2.2 circulation-bottom.inc,1.4.2.1,1.4.2.2 common-style.css,1.4,1.4.2.1 issues-bottom.inc,1.4.2.1,1.4.2.2 issues-top.inc,1.3.2.2,1.3.2.3 members-bottom.inc,1.4.2.1,1.4.2.2 members-top.inc,1.10.2.1,1.10.2.2 parameters-bottom.inc,1.4.2.1,1.4.2.2 reports-bottom.inc,1.4.2.1,1.4.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21912/koha-tmpl/intranet-tmpl/default/fr/includes Modified Files: Tag: rel_2_0 about-bottom.inc about-top.inc acquisitions-bottom.inc cat-bottom.inc cat-top.inc circulation-bottom.inc common-style.css issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc parameters-bottom.inc reports-bottom.inc Log Message: french translation fixes Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** about-bottom.inc 20 Jan 2004 09:10:33 -0000 1.2.2.1 --- about-bottom.inc 10 Feb 2004 14:06:17 -0000 1.2.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** about-top.inc 20 Jan 2004 09:10:33 -0000 1.3.2.1 --- about-top.inc 10 Feb 2004 14:06:17 -0000 1.3.2.2 *************** *** 7,11 **** ! --- 7,11 ---- ! *************** *** 33,37 **** ! + + +
    --- 33,37 ----
    ! --- 90,100 ---- ! Index: circulation-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** circulation-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- circulation-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/common-style.css,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** common-style.css 7 Aug 2003 14:19:55 -0000 1.4 --- common-style.css 10 Feb 2004 14:06:17 -0000 1.4.2.1 *************** *** 2,8 **** text-align: center; font: 1.2em sans-serif; ! padding: 10px 15px; border-style: solid; ! border-width: 2px; border-color: black; text-decoration: none; --- 2,8 ---- text-align: center; font: 1.2em sans-serif; ! padding: 3px; border-style: solid; ! border-width: 1px; border-color: black; text-decoration: none; *************** *** 13,17 **** background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } ! #menubar { border-top:1px solid #666666; --- 13,20 ---- background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } ! #problem { ! color: red; ! font-weight:bold; ! } #menubar { border-top:1px solid #666666; *************** *** 24,27 **** --- 27,36 ---- border-left:1px solid #000000; } + a { + text-decoration: none; + } + a:hover { + text-decoration: none; + } a.submenu { font-weight: normal; Index: issues-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** issues-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- issues-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** issues-top.inc 26 Jan 2004 10:47:57 -0000 1.3.2.2 --- issues-top.inc 10 Feb 2004 14:06:17 -0000 1.3.2.3 *************** *** 89,94 **** --- 73,80 ---- Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** parameters-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- parameters-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** reports-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- reports-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    From tipaul at users.sourceforge.net Tue Feb 10 15:06:20 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio-nomarc.tmpl,1.1.2.3,1.1.2.4 addbiblio.tmpl,1.10.2.3,1.10.2.4 addbooks.tmpl,1.3.2.3,1.3.2.4 additem-nomarc.tmpl,1.1.2.3,1.1.2.4 isbnsearch.tmpl,1.2.2.3,1.2.2.4 marcimport.tmpl,1.2.2.3,1.2.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21912/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: Tag: rel_2_0 addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl isbnsearch.tmpl marcimport.tmpl Log Message: french translation fixes Index: addbiblio-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/addbiblio-nomarc.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** addbiblio-nomarc.tmpl 28 Jan 2004 16:44:56 -0000 1.1.2.3 --- addbiblio-nomarc.tmpl 10 Feb 2004 14:06:18 -0000 1.1.2.4 *************** *** 32,36 **** --- 32,36 ---- Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -C2 -r1.10.2.3 -r1.10.2.4 *** addbiblio.tmpl 28 Jan 2004 16:44:56 -0000 1.10.2.3 --- addbiblio.tmpl 10 Feb 2004 14:06:18 -0000 1.10.2.4 *************** *** 17,35 ****
    Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** acquisitions-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- acquisitions-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** cat-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- cat-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -r1.12.2.1 -r1.12.2.2 *** cat-top.inc 20 Jan 2004 09:10:33 -0000 1.12.2.1 --- cat-top.inc 10 Feb 2004 14:06:17 -0000 1.12.2.2 *************** *** 90,97 ****     		! Ajouter une notice biblio ! Maintenance Cat
    ! Rayonnages virtuels ! Ajouter une notice biblio ! ! Maintenance Cat
    ! Ajouter un lecteur ! Ajouter une organisation
    ! Ajouter un lecteur ! Ajouter une organisation
    Titre Séries:
    ! (if applicable)
    Titre Séries:
    ! (si applicable)
    ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! Recherche Z39.50
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! ! ! ! ! Recherche Z39.50
    +   + + +
    >>>>
    +     +
    *************** *** 85,88 **** --- 100,115 ---- +
    + +
    <<<<
    +     +     		+ +
    >>>>
    +     +
    *************** *** 110,113 **** --- 137,152 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 135,138 **** --- 174,189 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 160,163 **** --- 211,226 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 185,188 **** --- 248,263 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 210,213 **** --- 285,300 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 235,238 **** --- 322,337 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 260,263 **** --- 359,374 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 285,288 **** --- 396,404 ---- + + +
    <<<<
    +     + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=oui'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=oui'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** addbooks.tmpl 28 Jan 2004 16:44:56 -0000 1.3.2.3 --- addbooks.tmpl 10 Feb 2004 14:06:18 -0000 1.3.2.4 *************** *** 22,26 **** ISBN: ! Si l'ISBN ou le titre est trouvé dans la table biblio, il sera récupéré et peut être modifié.
    Si l'ISBN ou le titre existe déjà dans le réservoir, il va être récupéré et une notice biblio sera ajoutée.
    --- 22,26 ---- ISBN: ! Si l'ISBN ou le titre est trouvé dans la table biblio, il sera récupéré et peut être modifié.
    Si l'ISBN ou le titre existe déjà dans le réservoir, il va être récupéré et une notice biblio sera ajoutée.
    *************** *** 32,38 ****   ! Créer une notice biblio vide ! Créer une notice biblio vide --- 32,38 ----   ! Créer une notice biblio vide ! Créer une notice biblio vide *************** *** 52,56 **** Mot-clé: ! --- 52,56 ---- Mot-clé: ! Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/additem-nomarc.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** additem-nomarc.tmpl 28 Jan 2004 16:44:56 -0000 1.1.2.3 --- additem-nomarc.tmpl 10 Feb 2004 14:06:18 -0000 1.1.2.4 *************** *** 117,121 **** ! OU Ajouter to a new Groupe: --- 117,121 ---- ! OU Add to a new Groupe: *************** *** 181,185 **** ! Nombre: --- 181,185 ---- ! Nombre;LIMITED: Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** isbnsearch.tmpl 28 Jan 2004 16:44:57 -0000 1.2.2.3 --- isbnsearch.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 5,9 **** Résultats trouvés
    ! Résultats to displayed

    --- 5,9 ---- Résultats trouvés
    ! Résultats to affiché

    *************** *** 46,50 **** ! ">Ajouter Ouvrages ">Editer... --- 46,50 ---- ! ">Ajouter items ">Editer... Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/marcimport.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** marcimport.tmpl 28 Jan 2004 16:44:57 -0000 1.2.2.3 --- marcimport.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 14,18 ****

    pas importé, car déjà existant dans la base de données

    pas importé, car déjà existant dans le réservoir

    !

    not imported because they seems not to be MARC format (ou ISBN/ISSN missing) !

    enregistrements étudiés

    Retour vers acquisition --- 14,18 ----

    pas importé, car déjà existant dans la base de données

    pas importé, car déjà existant dans le réservoir

    !

    pas importé, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) !

    enregistrements étudiés

    Retour vers acquisition *************** *** 40,44 **** ! Character encoding (MARC21 ou UNIMARC)
    --- 40,44 ---- ! Codage des caractères (MARC21 ou UNIMARC)
    From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/search.marc search.tmpl,1.4.2.3,1.4.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/search.marc Modified Files: Tag: rel_2_0 search.tmpl Log Message: french translation fixes Index: search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** search.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- search.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 14,25 **** "> ! ! ! ! --- 56,60 ---- ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-main.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-main.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-main.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 42,46 **** Cette bibliothèque fonctionne avec Koha SIGB sous licence libre, respectant les standards de l'internet ! XHTML 1\.0 valide

    --- 42,46 ---- Cette bibliothèque fonctionne avec Koha SIGB sous licence libre, respectant les standards de l'internet ! XHTML 1.0 valide

    Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-moredetail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-moredetail.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-moredetail.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 55,59 **** --- 55,59 ---- *************** *** 72,76 **** Vu:
    Dernier prêt:
    ! on issue bit Dernier emprunteur 1:
    Dernier emprunteur 2:
    --- 72,76 ---- Vu:
    Dernier prêt:
    ! En prêt \? Dernier emprunteur 1:
    Dernier emprunteur 2:
    Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-reserve.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-reserve.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-reserve.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 16,20 ****

    Il y a Réservations déjà faites sur cet ouvrage

    !

    Sélectionnez les types d'ouvrages souhaités\. Le premier disponible sera gardé pour vous\.

    --- 16,20 ----

    Il y a Réservations déjà faites sur cet ouvrage

    !

    Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous.

    Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-searchresults.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** opac-searchresults.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.3 --- opac-searchresults.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.4 *************** *** 63,67 **** ! --- 63,67 ---- ! *************** *** 145,149 ****

    ! Essayez une autre LIMITED:chercher

    --- 145,149 ----

    ! Essayez une autre chercher

    Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-userupdate.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** opac-userupdate.tmpl 8 Jan 2004 16:02:40 -0000 1.1.2.1 --- opac-userupdate.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.2 *************** *** 4,8 ****

    Modification informations lecteur

    Changer le nécessaire
    ! Your changes won't appear until the library has validated them.

    --- 4,8 ----

    Modification informations lecteur

    Changer le nécessaire
    ! Vos changement n'apparaitront que lorsque la bibliothèque les aura validé

    Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/subject.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** subject.tmpl 8 Jan 2004 16:02:40 -0000 1.1.2.1 --- subject.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.2 *************** *** 15,19 ****
    		AIDE :
    --- 14,25 ---- "> ! ! ! ! --- 28,33 ---- !
    		AIDE :
    *************** *** 28,32 ****
    ! From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/user userpage.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/user Modified Files: Tag: rel_2_0 userpage.tmpl Log Message: french translation fixes Index: userpage.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** userpage.tmpl 28 Jan 2004 16:45:31 -0000 1.1.2.3 --- userpage.tmpl 10 Feb 2004 14:06:51 -0000 1.1.2.4 *************** *** 11,15 ****
    !
    Reserves
    Vous avez les livres suivants en attente: --- 11,15 ---- ! ! --- 20,24 ---- ! From tipaul at users.sourceforge.net Tue Feb 10 15:07:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/members imemberentry.tmpl,1.5.2.3,1.5.2.4 memberentry.tmpl,1.8.2.3,1.8.2.4 member-password.tmpl,1.2.2.1,1.2.2.2 member.tmpl,1.7.2.3,1.7.2.4 moremember.tmpl,1.13.2.3,1.13.2.4 pay.tmpl,1.5.2.3,1.5.2.4 readingrec.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/members Modified Files: Tag: rel_2_0 imemberentry.tmpl memberentry.tmpl member-password.tmpl member.tmpl moremember.tmpl pay.tmpl readingrec.tmpl Log Message: french translation fixes Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/imemberentry.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** imemberentry.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- imemberentry.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 116,120 **** --- 116,120 ---- *************** *** 124,128 **** !

     

    --- 124,128 ---- !

     

    Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -r1.8.2.3 -r1.8.2.4 *** memberentry.tmpl 28 Jan 2004 16:45:32 -0000 1.8.2.3 --- memberentry.tmpl 10 Feb 2004 14:06:52 -0000 1.8.2.4 *************** *** 1,11 **** -

    Ajouter un lecteur Mise à jour du lecteur !


    --- 1,14 ---- +

    Ajouter un lecteur +

    +

    Mise à jour du lecteur +

    !
    Index: member-password.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** member-password.tmpl 20 Jan 2004 09:11:08 -0000 1.2.2.1 --- member-password.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.2 *************** *** 11,20 **** > ! Vous have entered a UserID that already exists. Please choose another one.
    Nouvel identifiant utilisateur: >
    Nouveau Mot de passe: >

    ! --- 11,20 ---- > ! Vous avez entered a UserID that already exists. Please choose another one.
    Nouvel identifiant utilisateur: >
    Nouveau Mot de passe: >

    ! Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -C2 -r1.7.2.3 -r1.7.2.4 *** member.tmpl 28 Jan 2004 16:45:32 -0000 1.7.2.3 --- member.tmpl 10 Feb 2004 14:06:52 -0000 1.7.2.4 *************** *** 7,11 ****
    ! --- 7,11 ----
    ! Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl,v retrieving revision 1.13.2.3 retrieving revision 1.13.2.4 diff -C2 -r1.13.2.3 -r1.13.2.4 *** moremember.tmpl 28 Jan 2004 16:45:32 -0000 1.13.2.3 --- moremember.tmpl 10 Feb 2004 14:06:52 -0000 1.13.2.4 *************** *** 25,29 **** N° Lecteur:
    Catégorie Lecteur:
    ! Frais:$30/year, Paid
    Joined: , Expires:
    Annexe d'inscription:

    --- 25,29 ---- N° Lecteur:
    Catégorie Lecteur:
    ! Frais:$30/année, Payé
    Joined: , Expires:
    Annexe d'inscription:

    *************** *** 53,57 ****

    ! Notes générales:

    --- 53,57 ----

    ! Notes générales:

    *************** *** 61,65 ****
    ! --- 61,65 ----
    ! Index: pay.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** pay.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- pay.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 39,43 ****

    Réservations
    Vous avez les livres suivants en attente: From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/reports reports-home.tmpl,1.2.2.1,1.2.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/reports Modified Files: Tag: rel_2_0 reports-home.tmpl Log Message: french translation fixes Index: reports-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** reports-home.tmpl 20 Jan 2004 09:14:53 -0000 1.2.2.1 --- reports-home.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.2 *************** *** 7,13 **** !
    • Jusqu'à la réconciliation: Daily Report (yesterday) !
    • Jusqu'à la réconciliation: Daily ! Report (today)
    • Ouvrages en retard --- 7,12 ---- !
      • Jusqu'à la réconciliation: Rapport quotidien (hier) !
      • Jusqu'à la réconciliation: Rapport quotidien (aujourd'hui)
      • Ouvrages en retard From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/marcimport AcceptItemCopy.tmpl,1.1.2.2,1.1.2.3 marcimportdetail.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/marcimport Modified Files: Tag: rel_2_0 AcceptItemCopy.tmpl marcimportdetail.tmpl Log Message: french translation fixes Index: AcceptItemCopy.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/Attic/AcceptItemCopy.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** AcceptItemCopy.tmpl 26 Jan 2004 10:47:57 -0000 1.1.2.2 --- AcceptItemCopy.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 2,6 ****
        ! Code barre '' has already been assigned.

        --- 2,6 ----

        ! Code barre a déjà été affecté.

        Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/Attic/marcimportdetail.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** marcimportdetail.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- marcimportdetail.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 20,24 ****

    Titre Séries" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Nombre" size=40 maxlenght=255>
    Date Volume" size=40 maxlenght=255>
    Description Volume" size=40 maxlenght=255>
    Titre Séries" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Nombre;LIMITED" size=40 maxlenght=255>
    Date Volume" size=40 maxlenght=255>
    Description Volume" size=40 maxlenght=255>
    !
    !
    !

     

    --- 39,43 ----
    !

     

    Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** readingrec.tmpl 20 Jan 2004 09:11:08 -0000 1.3.2.1 --- readingrec.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.2 *************** *** 19,23 ****     		/images/background-mem.gif"> ! &limit=">DATE DUE /images/background-mem.gif"> --- 19,23 ---- /images/background-mem.gif"> ! &limit=">DATE RETOUR /images/background-mem.gif"> From tipaul at users.sourceforge.net Tue Feb 10 15:07:46 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:46 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_60X.tmpl,1.2.2.2,1.2.2.3 unimarc_field_700_701_702.tmpl,1.1.2.2,1.1.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22441/koha-tmpl/intranet-tmpl/default/fr/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: french translation fixes Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -r1.2.2.2 -r1.2.2.3 *** unimarc_field_60X.tmpl 26 Jan 2004 10:48:53 -0000 1.2.2.2 --- unimarc_field_60X.tmpl 10 Feb 2004 14:07:44 -0000 1.2.2.3 *************** *** 101,105 ****
    "> ! "> Create a new authority/thesaurus entry : "> --- 101,105 ---- "> ! "> Create a new authority/thesaurus entry : "> Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/Attic/unimarc_field_700_701_702.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** unimarc_field_700_701_702.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- unimarc_field_700_701_702.tmpl 10 Feb 2004 14:07:44 -0000 1.1.2.3 *************** *** 29,33 **** "> ! Insérer une nouvelle autorité : "> --- 29,33 ---- "> ! Insérer une nouvelle autorité : "> From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318/koha-tmpl/intranet-tmpl/default/fr/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE ---
    Notice bibliographique



    Publié par : en , ,
    Collection:
    Sujet:
    Année :
    Notes:
    Titre uniforme:
    Dewey: ">
    Classification:
    LCCN:
    URL: ">
    ISBN:
    ,
    From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha detailprint.pl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318 Added Files: Tag: rel_2_0 detailprint.pl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE --- #!/usr/bin/perl # NOTE: Use standard 8-space tabs for this file (indents are 4 spaces) # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA use HTML::Template; use strict; require Exporter; use C4::Context; use C4::Output; # contains gettemplate use CGI; use C4::Search; use C4::Auth; use C4::Interface::CGI::Output; use C4::Date; my $query=new CGI; my $type=$query->param('type'); ($type) || ($type='intra'); my $biblionumber=$query->param('bib'); # change back when ive fixed request.pl my @items = ItemInfo(undef, $biblionumber, $type); my $norequests = 1; foreach my $itm (@items) { $norequests = 0 unless $itm->{'notforloan'}; } my $dat=bibdata($biblionumber); my ($authorcount, $addauthor)= &addauthor($biblionumber); my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber); my ($websitecount, @websites) = &getwebsites($biblionumber); $dat->{'count'}=@items; $dat->{'norequests'} = $norequests; $dat->{'additional'}=$addauthor->[0]->{'author'}; for (my $i = 1; $i < $authorcount; $i++) { $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'}; } # for my @results; $results[0]=$dat; my $resultsarray=\@results; my $itemsarray=\@items; my $webarray=\@webbiblioitems; my $sitearray=\@websites; my $startfrom=$query->param('startfrom'); ($startfrom) || ($startfrom=0); my ($template, $loggedinuser, $cookie) = get_template_and_user({ template_name => ('catalogue/detailprint.tmpl'), query => $query, type => "intranet", authnotrequired => ($type eq 'opac'), flagsrequired => {catalogue => 1}, }); my $count=1; # now to get the items into a hash we can use and whack that thru my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20); my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0); $template->param(startfrom => $startfrom+1, endat => $startfrom+20, numrecords => $count, nextstartfrom => $nextstartfrom, prevstartfrom => $prevstartfrom, BIBLIO_RESULTS => $resultsarray, ITEM_RESULTS => $itemsarray, WEB_RESULTS => $webarray, SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, biblionumber => $biblionumber, ); output_html_with_http_headers $query, $cookie, $template->output; # Local Variables: # tab-width: 8 # End: From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318/koha-tmpl/intranet-tmpl/default/en/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE ---
    BIBLIO RECORD



    Published by : in , ,
    Collection:
    Subject:
    Year :
    Notes:
    Unititle:
    Dewey: ">
    Classification:
    LCCN:
    URL: ">
    ISBN:
    ,
    From tipaul at users.sourceforge.net Tue Feb 10 17:43:44 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 08:43:44 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr opac-auth.tmpl,1.1.2.2,1.1.2.3 opac-detail.tmpl,1.1.2.2,1.1.2.3 opac-main.tmpl,1.1.2.2,1.1.2.3 opac-moredetail.tmpl,1.1.2.2,1.1.2.3 opac-reserve.tmpl,1.1.2.2,1.1.2.3 opac-searchresults.tmpl,1.1.2.3,1.1.2.4 opac-userupdate.tmpl,1.1.2.1,1.1.2.2 subject.tmpl,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26103/koha-tmpl/opac-tmpl/css/fr Modified Files: Tag: rel_2_0 opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-searchresults.tmpl opac-userupdate.tmpl subject.tmpl Log Message: french translation fixes Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-auth.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-auth.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-auth.tmpl 10 Feb 2004 16:43:41 -0000 1.1.2.3 *************** *** 3,22 **** !

    Désolé, je pense que vous n'avez pas les permissions suffisantes\.

    !

    Déconnecté\. Identifiez vous à nouveau\.

    !

    Vous avez changé d'adresse IP\. Identifiez vous à nouveau

    !

    Identifiant ou mot de passe erroné\. Essayez encore\.

    --- 3,22 ---- !

    Désolé, je pense que vous n'avez pas les permissions suffisantes.

    !

    Déconnecté. Identifiez vous à nouveau.

    !

    Vous avez changé d'adresse IP. Identifiez vous à nouveau

    !

    Identifiant ou mot de passe erroné. Essayez encore.

    Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-detail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-detail.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-detail.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 56,60 ****

    CODE BARRE !
    CODE BARRE !
    © Nombre d'ouvragesLIMITED:Localisation  
    © Nombre d'ouvragesLocalisation  

    ! Results à de réponses
    --- 15,19 ----
    ! Résultats à de réponses
    From tipaul at users.sourceforge.net Tue Feb 10 15:07:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters admin-home.tmpl,1.5.2.3,1.5.2.4 aqbookfund.tmpl,1.4.2.3,1.4.2.4 aqbudget.tmpl,1.4.2.3,1.4.2.4 authorised_values.tmpl,1.6.2.3,1.6.2.4 branches.tmpl,1.6.2.3,1.6.2.4 categorie.tmpl,1.5.2.3,1.5.2.4 categoryitem.tmpl,1.1.2.2,1.1.2.3 charges.tmpl,1.1.2.3,1.1.2.4 checkmarc.tmpl,1.3.2.3,1.3.2.4 currency.tmpl,1.1.2.2,1.1.2.3 itemtypes.tmpl,1.2.2.3,1.2.2.4 marc_subfields_structure.tmpl,1.3.2.3,1.3.2.4 marctagstructure.tmpl,1.7.2.3,1.7.2.4 printers.tmpl,1.1.2.3,1.1.2.4 stopwords.tmpl,1.2.2.3,1.2.2.4 systempreferences.tmpl,1.3.2.2,1.3.2.3 thesaurus.tmpl,1.5.2.3,1.5.2.4 z3950servers.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: Tag: rel_2_0 admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: french translation fixes Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** admin-home.tmpl 28 Jan 2004 16:45:31 -0000 1.5.2.3 --- admin-home.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 2,12 ****

    Paramètres


    !
    Paramètres système
    ! --- 2,14 ----

    Paramètres


    !
    Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
    Annexes
    Paramètres système
    ! ! + *************** *** 56,63 **** ! --- 58,67 ---- + + ! *************** *** 75,90 ****
    Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
    AnnexesContrôle la structure MARC. A utiliser avant de travailler avec de vraies données. Cela permet de mettre en évidence les erreurs qui peuvent corrompre la base de données.
    Divers paramètres
    ImprimantesImprimantes (UNIX paths).
    Contrôle la structure MARC. A utiliser avant de travailler avec de vraies données. Cela permet de mettre en évidence les erreurs qui peuvent corrompre la base de données.
    Divers paramètres
    ImprimantesImprinantes (chemin UNIX).
    !
    Outils
    ! --- 79,98 ----
    Export
    Exporter une notice biblio MARC Exporter en format MARC.
    Importer
    Charger des notices MARC dans le réservoir
    !
    Outils
    ! ! + + + Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** aqbookfund.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- aqbookfund.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 3,7 ****

    Admin Compte

    method=post> !
    Votre recherche sur


    --- 3,7 ----

    Admin Compte

    method=post> !
    Votre recherche sur


    *************** *** 24,28 ****

    ! --- 24,28 ---- ! *************** *** 43,47 ****       

    !

     

    --- 43,47 ----       

    !

     

    *************** *** 64,68 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 64,68 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 130,134 ****     !

     

    --- 130,134 ----     !

     

    Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** aqbudget.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- aqbudget.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 3,7 ****

    Admin Budget

    !
    Votre recherche sur


    --- 3,7 ----

    Admin Budget

    !
    Votre recherche sur


    *************** *** 23,27 ****

    !
    --- 23,27 ----

    !
    *************** *** 43,47 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 43,47 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 92,102 **** !

    !
    Export
    Exporter une notice biblio MARC Exporter en format MARC.
    Importer
    Charger des notices MARC dans le réservoir   Budget">//images/filenew.png" ALT="Ajouter budget" border=0>
      Budget">//images/filenew.png" ALT="Add budget" border=0>
    Nom
    CONFIRMER SUPPRESSION
    Nom
    CONFIRMER SUPPRESSION
    Date de début () 
    Date de fin ()
    Montant budget
     ">
    !

     

    --- 92,102 ---- ! Date de début ()  ! Date de fin () Montant budget  "> !

     

    Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -r1.6.2.3 -r1.6.2.4 *** authorised_values.tmpl 28 Jan 2004 16:45:31 -0000 1.6.2.3 --- authorised_values.tmpl 10 Feb 2004 14:06:52 -0000 1.6.2.4 *************** *** 51,56 ****

    Admin Valeurs autorisées

    Cette table est utilisée dans les définitions MARC. Vous pouvez définir autant de catégories et autant de valeurs autorisées pour chaque catégorie que vous voulez.

    !

    When you define the MARC subfield structure, you can link a subfield to an authorised-value category. When the user adds ou modifies a biblio, ! the subfield is not entered à a free field, but though a list sur authorised values.

    Nouvelle catégorie... --- 51,55 ----

    Admin Valeurs autorisées

    Cette table est utilisée dans les définitions MARC. Vous pouvez définir autant de catégories et autant de valeurs autorisées pour chaque catégorie que vous voulez.

    !

    Quand vous définissez la structure des sous-champs MARC, vous pouvez lier un sous-champ à une catégorie de valeurs autorisées. Quand l'utilisateur ajoute ou modifie une notice biblio, la valeur du sous-champ n'est pas libre, mais doit appartenir à la liste des valeurs autorisées.

    Nouvelle catégorie... Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -r1.6.2.3 -r1.6.2.4 *** branches.tmpl 28 Jan 2004 16:45:32 -0000 1.6.2.3 --- branches.tmpl 10 Feb 2004 14:06:52 -0000 1.6.2.4 *************** *** 1,5 **** !


    --- 1,6 ---- ! !


    *************** *** 57,61 ****   ! --- 58,62 ----   ! *************** *** 98,102 **** ! (nothing entered) --- 99,103 ---- ! (pas de saisie) *************** *** 116,120 **** ! (no categories set) --- 117,121 ---- ! (pas de catégorie définie) *************** *** 127,131 **** !
    --- 128,132 ---- ! *************** *** 141,145 ****
    method=post> !
    --- 142,146 ----
    method=post> !
    Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** categorie.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- categorie.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 96,100 **** ! Période d'inscription --- 96,100 ---- ! Durée inscription *************** *** 102,106 **** ! Limite d'âge supérieure --- 102,106 ---- ! Age maxi *************** *** 108,112 **** ! Age obligatoire --- 108,112 ---- ! Age mini *************** *** 178,190 **** ! Période d'inscription ! Limite d'âge supérieure ! Age obligatoire --- 178,190 ---- ! Durée inscription ! Age maxi ! Age mini *************** *** 194,201 **** - en gros - - - Frais d'inscription --- 194,197 ---- *************** *** 238,242 **** Donnée effacée !
    --- 234,238 ---- Donnée effacée !
    *************** *** 247,269 ****

    Admin Catégorie

    ! Votre recherche sur !
    ! > !
    ! ! ! ! ! ! ! --- 243,264 ----

    Admin Catégorie

    ! Votre recherche sur ! ! > ! !
    Catégorie DescriptionInscriptionLimite d'âge supérieureAge obligatoire Amendeen grosFraisEn retard Limite de prêt Réserver
    ! ! ! ! ! *************** *** 276,285 **** ! ! ! --- 271,284 ---- + ! Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/categoryitem.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** categoryitem.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- categoryitem.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 93,97 **** ! ! ! ! ! ! ! ! ! ! ! --- 181,193 ---- ! ! ! *************** *** 201,205 **** ! --- 201,205 ---- ! *************** *** 255,259 **** > ! --- 255,259 ---- > ! *************** *** 263,272 **** ! ! ! --- 263,272 ---- ! ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** charges.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- charges.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 1,8 ****

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, son cycle
    ! eg 1,7,7 = $1 fine, after 7 days, every 7 days

    !

    Note : fines are calculated by the fines2.pl script, located in misc directory. ! Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

    --- 1,7 ----

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours

    !

    Note : les amendes sont calculées par le misc/script fines2.pl. Demandez à votre administrateur de mettre ce script dans le crontab, après minuit, pour que les amendes soient calculées chaque nuit

    Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** checkmarc.tmpl 28 Jan 2004 16:45:32 -0000 1.3.2.3 --- checkmarc.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.4 *************** *** 11,15 **** --- 11,15 ---- *************** *** 25,29 **** --- 25,29 ---- *************** *** 105,110 **** --- 105,110 ---- *************** *** 118,122 **** ! --- 118,122 ---- ! Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** currency.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- currency.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 164,168 **** > ! --- 164,168 ---- > ! *************** *** 182,187 **** ! ! --- 182,187 ---- ! ! Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** itemtypes.tmpl 28 Jan 2004 16:45:32 -0000 1.2.2.3 --- itemtypes.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.4 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 81,90 **** ! ! --- 81,99 ---- ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** marc_subfields_structure.tmpl 28 Jan 2004 16:45:32 -0000 1.3.2.3 --- marc_subfields_structure.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.4 *************** *** 11,15 ****
    Catégorie DescriptionDurée inscriptionFrais d'inscriptionAge maxiAge mini AmendeSignaler retard Limite de prêt Réserver OuiNon ! Oui ! ! Non ! !
    Période d'inscription > --- 93,97 ----
    Durée d'inscription > *************** *** 99,103 ****
    Limite d'âge supérieure > --- 99,103 ----
    Age maxi > *************** *** 105,109 ****
    Age obligatoire > --- 105,109 ----
    Age mini > *************** *** 123,127 ****
    Frais d'inscription > --- 123,127 ----
    Frais inscription > *************** *** 181,193 ****
    Période d'inscription
    Limite d'âge supérieure
    Age obligatoire
    Durée d'inscription
    Age maxi
    Age mini
    Frais d'inscription
    Frais inscription
    Description InscriptionLimite d'âge supérieureAge obligatoire Amende en gros FraisEn retard Limite de prêt RéserverDescription InscriptionAge maxiAge mini Amende en gros FraisSignaler retard Limite de prêt Réserver
    itemnum
  • Le champ itemnumb DOIT être connecté
    • !
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    itemnum
  • Le champ itemnumb DOIT être connecté
    • !
  • Le sous-champ correspondant DOIT être dans l'onglet -1 (ignore)
    		•
    TOUS les champs ouvrage DOIVENT :
  • être relié à la même étiquette,
    • !
  • et they doit tous be in the 10 (items) tab
    		•
    TOUS les champs ouvrage DOIVENT :
  • être relié à la même étiquette,
    • !
  • et ils doivent tous être dans l'onglet 10 (items)
    		•
    Les champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
  • être relié à l'étiquette MARC,
    • !
  • be in the SAME tag (for example : 090$a et 090$b)
    • !
  • \$etre dans l'onglet -1 \(items\)
    		•
    Les champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
  • être relié à l'étiquette MARC,
    • !
  • être dans la MEME étiquette (par ex. : 090$a et 090$b)
    • !
  • être dans l'onglet -1 (items)
    		•
    TOTALVous have error(s) in your MARC configuration. Please fix them before using koha
    TOTALVous avez erreurs dans votre configuration MARC. Corrigez-les avant d'utiliser Koha
    EditerSupprimer
    EditerSupprimer
    Non empruntablechecked value=1> (if checked, no item sur this type can be issued. ! If not checked, every item sur this type can be issued unless notforloan is set for a specific item)
    Durée de prêt (meaningful only if not for loan is not set)
    Non empruntable ! ! ! ! ! ! Si coché, aucun ouvrage de ce type ne peut être emprunté. Sinon, les ouvrages peuvent être empruntés sauf si le champ "notforloan" de l'ouvrage est coché. !
    Durée de prêt ! ! Utilisé seulement si "Non empruntable" n'est pas coché. !
    ! --- 11,15 ----
    ChampLib for librarians / for opac Repet obligatoire
    ! *************** *** 68,75 **** ! MARC subfield structure admin for !

    This screen shows the subfields associated with the selected tag. Vous can edit subfields ou ajouter a new one by clicking on "edit".

    !

    The column champ Koha shows that the subfield is linked with a "champ Koha". Koha can manage a MARC interface, ou a Koha interface. This link ensures that ! both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    ChampLibellé OPAC Repet obligatoire
    --- 68,74 ---- !

    MARC subfield structure admin for

    !

    This screen shows the subfields associated with the selected tag. Vous can edit subfields ou add a new one by clicking on edit.

    !

    The column champ Koha shows that the subfield is linked with a champ Koha. Koha can manage a MARC interface, ou a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    *************** *** 78,84 **** ! ! ! --- 77,83 ---- ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -C2 -r1.7.2.3 -r1.7.2.4 *** marctagstructure.tmpl 28 Jan 2004 16:45:32 -0000 1.7.2.3 --- marctagstructure.tmpl 10 Feb 2004 14:06:52 -0000 1.7.2.4 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 59,67 ****
    Lib champ Koha ?Rep ?obligatoire ?Onglet ? Valeur autorisée ? Thésaurus ?Lib champ Koha ?Rep ?obligatoire ?Onglet ? Valeur autorisée ? Thésaurus ?
    ! ! !
    Etiquette
    Lib for librarians
    Lib for opac
    Répétable
    Obligatoire
    Valeur autorisée (if you select a value ici, the indicators will be limited to the authorised value list)
     
    --- 59,67 ---- ! ! !
    Etiquette
    Libellé bibliothécaire
    Lib pour l'opac
    Répétable
    Obligatoire
    Valeur autorisée (Si vous sélectionnez une valeur ici, les indicateurs seront limités une liste de valeurs autorisées)
     
    *************** *** 97,101 ****
    !
    --- 97,101 ----
    !
    Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** printers.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- printers.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 155,159 ****
    > !
    --- 155,159 ----
    > !
    Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** stopwords.tmpl 28 Jan 2004 16:45:32 -0000 1.2.2.3 --- stopwords.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 133,137 ****
    > !
    --- 133,137 ----
    > !
    Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** systempreferences.tmpl 26 Jan 2004 10:48:53 -0000 1.3.2.2 --- systempreferences.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.3 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 56,60 **** !

    Modifier une préférence système

    --- 56,60 ---- !

    Modifier une préférence système

    *************** *** 78,82 **** ! Donnée enregistrée
    --- 78,82 ---- ! Donnée enregistrée *************** *** 86,92 **** ! ! --- 86,92 ---- !
    Variable
    ! *************** *** 95,99 **** !
    Variable
    CONFIRMER SUPPRESSION
    --- 95,99 ----
    CONFIRMER SUPPRESSION !
    *************** *** 101,105 **** ! Donnée effacée
    --- 101,105 ---- ! Donnée effacée *************** *** 108,121 **** !

    Admin Préférences système

    !
    ! --- 108,121 ---- !

    Admin Préférences système

    !
    Variable Valeur
    ! Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** thesaurus.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- thesaurus.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 6,10 ****
    Variable Valeur
    !
    Values related to ()
    --- 6,10 ---- !
    En liaison avec ()
    *************** *** 29,33 **** "> "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Ajouter" BORDER=0 >
    --- 29,33 ---- "> "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Add" BORDER=0 >
    *************** *** 99,104 ****

    Gestion du thésaurus et des fichiers autorités.

      ! Extraire: see data dependent one this one
      ! Lié: see other forms sur this authority entry

    --- 99,104 ----

    Gestion du thésaurus et des fichiers autorités.

      ! Extraire: Voir les formes associées
      ! Lié: Voir les formes rejetées

    *************** *** 125,129 **** ! Extraire Lié ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> --- 125,129 ---- ! Extraire   Lié ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> *************** *** 137,142 **** ! !
    " class="button">Précédents" class="button"> Suivant
    --- 137,142 ---- ! !
    " class="button">Previous" class="button"> Next
    *************** *** 147,151 **** "> "> !

    --- 147,151 ---- "> "> !

    Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** z3950servers.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- z3950servers.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 128,136 **** ! Vérifié (searched by default) ! Rang (display order) --- 128,136 ---- ! Coché (recherche par défaut) ! Rang (ordre d'affichage) *************** *** 138,142 **** ! Syntaxe (z3950 can send enregistrements in various format. Choose one) *************** *** 228,232 ****
    > !
    --- 228,232 ----
    > !
    From tipaul at users.sourceforge.net Wed Feb 11 09:22:38 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:22:38 -0800 Subject: [Koha-cvs] CVS: koha/misc release_notes_200RC4.txt,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19999 Modified Files: Tag: rel_2_0 release_notes_200RC4.txt Log Message: synch'ing release notes Index: release_notes_200RC4.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/Attic/release_notes_200RC4.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** release_notes_200RC4.txt 10 Feb 2004 13:22:26 -0000 1.1.2.1 --- release_notes_200RC4.txt 11 Feb 2004 08:22:36 -0000 1.1.2.2 *************** *** 6,14 **** If you test it and let us know about any we haven't seen yet, it will help us to fix them. - The 2.0.x series version is "feature freezed". Only bugs or minor changes will be made in this branch. - The koha team is already working on the 2.2.x version. - In CVS (HEAD branch), developpers can already get 1st draft of a working z3950 server. - - INSTALLATION --- 6,9 ---- *************** *** 20,24 **** ! UPGRADE from previous 2.0.0preX version * Download the package --- 15,19 ---- ! UPGRADE from previous 2.0.0preX or RCx version * Download the package *************** *** 51,60 **** Now Koha 2.0.0RC4 is ready for you to test. - BUGFIXES/IMPROVEMENTS: BUGS FIXED: * indicators where stored but not displayed in MARC editor/viewer. * book shelves work again (note bookshelves are not avaible in OPAC. they will be added in 2.2.0) * it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and recieve a past order) * removing "bulk", useless field, in admin/categorie.pl list (NOT in DB, in case someone uses the field) --- 46,60 ---- Now Koha 2.0.0RC4 is ready for you to test. BUGFIXES/IMPROVEMENTS: BUGS FIXED: + major : + * #293 : Error Issuing Book - 1 (a very old one...) + * #605 : circulation.pl only shows one waiting item + * #661 : Set three variables for the circ template: gna, lost, and dbarred + * biblio deletion : in some cases, the biblio deletion was done on another biblio than the one asked. * indicators where stored but not displayed in MARC editor/viewer. * book shelves work again (note bookshelves are not avaible in OPAC. they will be added in 2.2.0) + minor : * it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and recieve a past order) * removing "bulk", useless field, in admin/categorie.pl list (NOT in DB, in case someone uses the field) *************** *** 62,70 **** * Next borrower didn't work in circulation.pl (didn't return to borrower form) * in circulation.pl, removing
    to have all informations without sidebar on a 1024x768 screen. ! * in curculation.pl, ODUES are in red in borrower header IMPROVEMENTS: * Minor translation & HTML fixes. * Adding >>> in biblio editor to change tab. ! ! DB change in RC2: --- 62,70 ---- * Next borrower didn't work in circulation.pl (didn't return to borrower form) * in circulation.pl, removing
    to have all informations without sidebar on a 1024x768 screen. ! * in circulation.pl, ODUES are in red in borrower header ! * quoting correctly titles with a " inside, in MARC editor IMPROVEMENTS: * Minor translation & HTML fixes. * Adding >>> in biblio editor to change tab. ! * Adding a "print" link in MARCbiblio : popup a small windows, print the biblio, and closes. Nice for libraries still having a paper catalog. \ No newline at end of file From tipaul at users.sourceforge.net Wed Feb 11 09:35:34 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:35:34 -0800 Subject: [Koha-cvs] CVS: koha detailprint.pl,1.1,1.2 catalogue-home.pl,1.9,1.10 detail.pl,1.22,1.23 insertidata.pl,1.5,1.6 memberentry.pl,1.38,1.39 newmember.pl,1.18,1.19 search.pl,1.33,1.34 shelves.pl,1.12,1.13 thesaurus_popup.pl,1.14,1.15 release_notes_191.txt,1.1,NONE release_notes_192.txt,1.1,NONE release_notes_193.txt,1.1,NONE release_notes_200pre1.txt,1.2,NONE release_notes_200pre2.txt,1.2,NONE release_notes_200pre3.txt,1.1,NONE release_notes_200pre4.txt,1.1,NONE release_notes_200pre5.txt,1.1,NONE release_notes_200RC1.txt,1.4,NONE Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22477 Modified Files: catalogue-home.pl detail.pl insertidata.pl memberentry.pl newmember.pl search.pl shelves.pl thesaurus_popup.pl Added Files: detailprint.pl Removed Files: release_notes_191.txt release_notes_192.txt release_notes_193.txt release_notes_200pre1.txt release_notes_200pre2.txt release_notes_200pre3.txt release_notes_200pre4.txt release_notes_200pre5.txt release_notes_200RC1.txt Log Message: synch'ing 2.0.0 branch and head Index: catalogue-home.pl =================================================================== RCS file: /cvsroot/koha/koha/catalogue-home.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** catalogue-home.pl 8 Aug 2003 13:46:26 -0000 1.9 --- catalogue-home.pl 11 Feb 2004 08:35:31 -0000 1.10 *************** *** 17,21 **** type => "intranet", authnotrequired => 0, ! flagsrequired => {parameters => 1}, debug => 1, }); --- 17,21 ---- type => "intranet", authnotrequired => 0, ! flagsrequired => {catalogue => 1}, debug => 1, }); Index: detail.pl =================================================================== RCS file: /cvsroot/koha/koha/detail.pl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** detail.pl 8 May 2003 13:19:40 -0000 1.22 --- detail.pl 11 Feb 2004 08:35:31 -0000 1.23 *************** *** 96,100 **** SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, ! biblionumber => $biblionumber); output_html_with_http_headers $query, $cookie, $template->output; --- 96,101 ---- SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, ! biblionumber => $biblionumber, ! ); output_html_with_http_headers $query, $cookie, $template->output; Index: insertidata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertidata.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** insertidata.pl 6 Jun 2003 10:00:52 -0000 1.5 --- insertidata.pl 11 Feb 2004 08:35:31 -0000 1.6 *************** *** 40,86 **** my $problems; my $env; foreach my $key (@names){ $data{$key}=$input->param($key); } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; ! my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ ! $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}', ! cardnumber='$data{'cardnumber_institution'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}', ! streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}', ! altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}', ! emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}', ! altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}', ! city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}', ! borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'institution_name'}', ! initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}', ! gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}', ! textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}', ! zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}' ! where borrowernumber=$data{'borrowernumber'}"; } else { my $surname=$data{'institution_name'}; ! $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, ! firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity, ! altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,guarantor,school,branchcode,zipcode,homezipcode) ! values ('','$data{'expiry'}','$data{'cardnumber_institution'}', ! '','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', ! '$data{'firstname'}','$data{'altnotes'}','','$data{'contactname'}', ! '$data{'emailaddress'}', ! now(),'$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}', ! '$data{'phoneday'}','I','$data{'city'}','$data{'area'}','$data{'phone'}', ! '$data{'borrowernotes'}','$data{'altphone'}','$surname','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','','','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } - #print $query; - my $sth2=$dbh->prepare($query); - warn "==> $query"; - $sth2->execute; $sth2->finish; ! #$sth->finish; print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}"); --- 40,107 ---- my $problems; my $env; + my $sth2; foreach my $key (@names){ $data{$key}=$input->param($key); } my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?"); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ ! $sth2=$dbh->prepare("update borrowers set title=?,expiry=?, ! cardnumber=?,sex=?,ethnotes=?, ! streetaddress=?,faxnumber=?,firstname=?, ! altnotes=?,dateofbirth=?,contactname=?, ! emailaddress=?,dateenrolled=?,streetcity=?, ! altrelationship=?,othernames=?,phoneday=?, ! city=?,area=?,phone=?, ! borrowernotes=?,altphone=?,surname=?, ! initials=?,physstreet=?,ethnicity=?, ! gonenoaddress=?,lost=?,debarred=?, ! textmessaging=?, branchcode = ?, ! zipcode = ?,homezipcode=? ! where borrowernumber=?"); ! $sth2->execute($data{'title'},$data{'expiry'}, ! $data{'cardnumber_institution'},$data{'sex'},$data{'ethnicnotes'}, ! $data{'address'},$data{'faxnumber'},$data{'firstname'}, ! $data{'altnotes'},$data{'dateofbirth'},$data{'contactname'}, ! $data{'emailaddress'},$data{'joining'},$data{'streetcity'}, ! $data{'altrelationship'},$data{'othernames'},$data{'phoneday'}, ! $data{'city'},$data{'area'},$data{'phone'}, ! $data{'borrowernotes'},$data{'altphone'},$data{'institution_name'}, ! $data{'initials'},$data{'streetaddress'},$data{'ethnicity'}, ! $data{'gna'},$data{'lost'},$data{'debarred'}, ! $data{'textmessaging'},$data{'branchcode'}, ! $data{'zipcode'},$data{'homezipcode'}, ! $data{'borrowernumber'}); } else { my $surname=$data{'institution_name'}; ! # note for code reading : 5 on each line ! $sth2=$dbh->prepare("insert into borrowers ( ! title, expiry, cardnumber, sex, ethnotes, ! streetaddress, faxnumber, firstname, altnotes, dateofbirth, ! contactname, emailaddress, dateenrolled, streetcity, altrelationship, ! othernames, phoneday, categorycode, city, area, ! phone, borrowernotes, altphone, surname, initials, ! ethnicity, borrowernumber,guarantor, school, branchcode, ! zipcode, homezipcode) ! values ( ?,?,?,?,?, ! ?,?,?,?,?, ! ?,?,now(),?,?, ! ?,?,?,?,?, ! ?,?,?,?,?, ! ?,?,?,?,?, ! ?,? ! )"); ! $sth2->execute('', $data{'expiry'}, $data{'cardnumber_institution'}, '', $data{'ethnotes'}, ! $data{'address'}, $data{'faxnumber'}, $surname, $data{'altnotes'}, '', ! $data{'contactname'},$data{'emailaddress'}, $data{'streetcity'}, $data{'altrelationship'}, # only 4 because of now() ! $data{'othernames'}, $data{'phoneday'}, 'I', $data{'city'}, $data{'area'}, ! ''.$data{'phone'}, $data{'borrowernotes'}, $data{'altphone'}, $surname, ''.$data{'initials'}, ! $data{'ethnicity'}, $data{'borrowernumber'}, '', '', $data{'branchcode'}, ! $data{'zipcode'}, $data{'homezipcode'}); } $sth2->finish; ! $sth->finish; print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}"); Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** memberentry.pl 31 Dec 2003 18:08:33 -0000 1.38 --- memberentry.pl 11 Feb 2004 08:35:31 -0000 1.39 *************** *** 60,67 **** print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member"); } else { # this else goes down the whole script ! if ($type ne 'Add'){ ! $template->param( header => 'Update Member Details'); # bad templating style } else { ! $template->param( header => 'Add New Member'); } --- 60,67 ---- print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member"); } else { # this else goes down the whole script ! if ($type eq 'Add'){ ! $template->param( addAction => 1); } else { ! $template->param( addAction =>0); } Index: newmember.pl =================================================================== RCS file: /cvsroot/koha/koha/newmember.pl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** newmember.pl 18 Dec 2003 17:02:13 -0000 1.18 --- newmember.pl 11 Feb 2004 08:35:31 -0000 1.19 *************** *** 127,133 **** my $sex; if ($data{'sex'} eq 'M'){ ! $sex="Male"; } else { ! $sex="Female"; } if ($data{'joining'} eq ''){ --- 127,133 ---- my $sex; if ($data{'sex'} eq 'M'){ ! $sex=1; } else { ! $sex=0; } if ($data{'joining'} eq ''){ Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.pl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** search.pl 19 Dec 2003 17:28:03 -0000 1.33 --- search.pl 11 Feb 2004 08:35:31 -0000 1.34 *************** *** 20,26 **** --- 20,35 ---- # $Log$ + # Revision 1.34 2004/02/11 08:35:31 tipaul + # synch'ing 2.0.0 branch and head + # # Revision 1.33 2003/12/19 17:28:03 tipaul # fix for #683 # + # Revision 1.32.2.2 2004/01/13 17:33:39 tipaul + # removing useless (& buggy here) checkauth + # + # Revision 1.32.2.1 2003/12/19 17:28:42 tipaul + # fix for 683 + # # Revision 1.32 2003/06/11 18:37:55 tonnesen # Using boolean_preference instead of preference for 'marc' setting *************** *** 43,50 **** my $type=$query->param('type'); - #(-e "opac") && ($type='opac'); - - my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0)); - my $startfrom=$query->param('startfrom'); ($startfrom) || ($startfrom=0); --- 52,55 ---- Index: shelves.pl =================================================================== RCS file: /cvsroot/koha/koha/shelves.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** shelves.pl 5 Feb 2003 10:04:14 -0000 1.12 --- shelves.pl 11 Feb 2004 08:35:31 -0000 1.13 *************** *** 5,10 **** # $Header$ # - - # Copyright 2000-2002 Katipo Communications # --- 5,8 ---- *************** *** 36,40 **** my $env; my $query = new CGI; - #print $query->header(-cookie => $cookie); my $headerbackgroundcolor='#663266'; my $circbackgroundcolor='#555555'; --- 34,37 ---- *************** *** 45,83 **** = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {parameters => 1}, ! }); ! #print startpage(); ! #print startmenu('catalogue'); ! #print "

    Logged in as: $loggedinuser [Log Out]

    \n"; ! ! ! my ($shelflist) = GetShelfList(); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); } - } } SWITCH: { ! $template->param({ loggedinuser => $loggedinuser, ! viewshelf => $query->param('viewshelf'), ! shelves => $query->param('shelves'), ! headerbackgroundcolor => $headerbackgroundcolor, ! circbackgroundcolor => $circbackgroundcolor }); ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 42,77 ---- = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {catalogue => 1}, ! }); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); ! } } } + my ($shelflist) = GetShelfList(); + $template->param({ loggedinuser => $loggedinuser, + headerbackgroundcolor => $headerbackgroundcolor, + circbackgroundcolor => $circbackgroundcolor }); SWITCH: { ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! } ! ! ($shelflist) = GetShelfList(); # rebuild shelflist in case a shelf has been added ! ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 87,106 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); - } - $template->param(shelvesloop => \@shelvesloop); } output_html_with_http_headers $query, $cookie, $template->output; - sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); } - } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { --- 81,98 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); } + $template->param(shelvesloop => \@shelvesloop); output_html_with_http_headers $query, $cookie, $template->output; sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); ! } } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { *************** *** 114,123 **** #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 106,115 ---- #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 127,143 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop); } - - sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 119,135 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop, ! shelves => 1, ! ); } sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 148,162 **** $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop); ! $template->param( shelfname => $shelflist->{$shelfnumber}->{'shelfname'}); ! $template->param( shelfnumber => $shelfnumber); } - #print endpage(); - #print endmenu('catalogue'); - # # $Log$ # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains --- 140,159 ---- $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop, ! shelfname => $shelflist->{$shelfnumber}->{'shelfname'}, ! shelfnumber => $shelfnumber, ! viewshelf => $query->param('viewshelf'), ! ); } # # $Log$ + # Revision 1.13 2004/02/11 08:35:31 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.12.2.1 2004/02/06 14:22:19 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains Index: thesaurus_popup.pl =================================================================== RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** thesaurus_popup.pl 12 Jan 2004 16:58:20 -0000 1.14 --- thesaurus_popup.pl 11 Feb 2004 08:35:31 -0000 1.15 *************** *** 37,40 **** --- 37,41 ---- my $result = $input->param('result'); my $search_string= $input->param('search_string'); + $search_string = $result unless ($search_string); my $op = $input->param('op'); my $id = $input->param('id'); *************** *** 42,46 **** my $index= $input->param('index'); my $insert = $input->param('insert'); ! my $dbh = C4::Context->dbh; --- 43,47 ---- my $index= $input->param('index'); my $insert = $input->param('insert'); ! my $nohierarchy = $input->param('nohierarchy'); # if 1, just show the last part of entry (Marseille). If 0, show everything (Europe -- France --Marseille) my $dbh = C4::Context->dbh; *************** *** 52,58 **** my ($father,$freelib_text) = $sti->fetchrow_array; if (length($result)>0) { ! $result .= "|$father $freelib_text"; } else { ! $result = "$father $freelib_text"; } } --- 53,67 ---- my ($father,$freelib_text) = $sti->fetchrow_array; if (length($result)>0) { ! if ($nohierarchy) { ! $result .= "|$freelib_text"; ! } else { ! $result .= "|$father $freelib_text"; ! } } else { ! if ($nohierarchy) { ! $result = "$freelib_text"; ! } else { ! $result = "$father $freelib_text"; ! } } } *************** *** 78,82 **** $sti->execute($search_string,$category); while (my $line=$sti->fetchrow_hashref) { ! $stdlib{$line->{'id'}} = "$line->{'father'} $line->{'freelib'}"; push(@freelib,$line->{'id'}); } --- 87,95 ---- $sti->execute($search_string,$category); while (my $line=$sti->fetchrow_hashref) { ! if ($nohierarchy) { ! $stdlib{$line->{'id'}} = "$line->{'freelib'}"; ! } else { ! $stdlib{$line->{'id'}} = "$line->{'father'} $line->{'freelib'}"; ! } push(@freelib,$line->{'id'}); } *************** *** 106,110 **** result => $result, category => $category, ! index => $index ); output_html_with_http_headers $input, $cookie, $template->output; --- 119,124 ---- result => $result, category => $category, ! index => $index, ! nohierarchy => $nohierarchy, ); output_html_with_http_headers $input, $cookie, $template->output; --- release_notes_191.txt DELETED --- --- release_notes_192.txt DELETED --- --- release_notes_193.txt DELETED --- --- release_notes_200pre1.txt DELETED --- --- release_notes_200pre2.txt DELETED --- --- release_notes_200pre3.txt DELETED --- --- release_notes_200pre4.txt DELETED --- --- release_notes_200pre5.txt DELETED --- --- release_notes_200RC1.txt DELETED --- From tipaul at users.sourceforge.net Wed Feb 11 09:40:12 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:12 -0800 Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.66,1.67 Message-ID: Update of /cvsroot/koha/koha/C4/Circulation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/C4/Circulation Modified Files: Circ2.pm Log Message: synch'ing 2.0.0 branch and head Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** Circ2.pm 19 Dec 2003 14:44:46 -0000 1.66 --- Circ2.pm 11 Feb 2004 08:40:10 -0000 1.67 *************** *** 635,639 **** $noissue=1; } else { ! $rejected=-1; last SWITCH; } --- 635,639 ---- $noissue=1; } else { ! $rejected="Item on issue to this borrower, and you have chosen not to renew"; last SWITCH; } *************** *** 669,673 **** my $branches = getbranches(); my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'}; ! if ($responses->{2} eq '') { $questionnumber=2; # FIXME - Assumes HTML --- 669,673 ---- my $branches = getbranches(); my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'}; ! if ($responses->{2} eq '' && $responses->{3} eq '') { $questionnumber=2; # FIXME - Assumes HTML *************** *** 676,680 **** last SWITCH; } elsif ($responses->{2} eq 'N') { ! $rejected=-1; last SWITCH; } else { --- 676,680 ---- last SWITCH; } elsif ($responses->{2} eq 'N') { ! $rejected="Issue cancelled"; last SWITCH; } else { From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21,1.22 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui.simple Modified Files: addbiblio.pl additem.pl Log Message: synch'ing 2.0.0 branch and head Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** addbiblio.pl 22 Dec 2003 19:16:58 -0000 1.33 --- addbiblio.pl 11 Feb 2004 08:40:11 -0000 1.34 *************** *** 161,164 **** --- 161,165 ---- sub create_input () { my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth) = @_; + $value =~ s/"/"/g; my $dbh = C4::Context->dbh; my %subfield_data; *************** *** 197,201 **** my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values ! where category=? order by authorised_value"); # loop through each tab 0 through 9 --- 198,202 ---- my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values ! where category=? order by lib"); # loop through each tab 0 through 9 *************** *** 213,218 **** my $value=$field->data(); my $subfield="@"; ! push(@subfields_data, &create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth)) ! unless ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); $i++; } else { --- 214,219 ---- my $value=$field->data(); my $subfield="@"; ! next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! push(@subfields_data, &create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth)); $i++; } else { *************** *** 231,236 **** next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! next if ($tag > 10 && defined($record->field($tag)->subfield($subfield))); ! next if ($tag < 10 && defined($record->field($tag)->data())); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); $i++; --- 232,237 ---- next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! next if ($tag<10); ! next if (defined($record->field($tag)->subfield($subfield))); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); $i++; *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $indicator; $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 241,245 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); *************** *** 325,329 **** type => "intranet", authnotrequired => 0, ! flagsrequired => {catalogue => 1}, debug => 1, }); --- 326,330 ---- type => "intranet", authnotrequired => 0, ! flagsrequired => {editcatalogue => 1}, debug => 1, }); Index: additem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** additem.pl 12 Jan 2004 17:00:09 -0000 1.21 --- additem.pl 11 Feb 2004 08:40:11 -0000 1.22 *************** *** 275,277 **** $template->param($error => 1); } ! output_html_with_http_headers $input, $cookie, $template->output; \ No newline at end of file --- 275,277 ---- $template->param($error => 1); } ! output_html_with_http_headers $input, $cookie, $template->output; From tipaul at users.sourceforge.net Wed Feb 11 09:40:12 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:12 -0800 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Catalogue.pm,1.37,1.38 Members.pm,1.2,1.3 Output.pm,1.46,1.47 Search.pm,1.85,1.86 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/C4 Modified Files: Biblio.pm BookShelves.pm Catalogue.pm Members.pm Output.pm Search.pm Log Message: synch'ing 2.0.0 branch and head Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -r1.78 -r1.79 *** Biblio.pm 9 Dec 2003 15:57:28 -0000 1.78 --- Biblio.pm 11 Feb 2004 08:40:09 -0000 1.79 *************** *** 567,571 **** return; } - # otherwise, skip through each subfield... my @fields = $record->fields(); --- 567,570 ---- *************** *** 695,699 **** $dbh->do("delete from marc_subfield_table where bibid='$bibid' and tag='$tag' and tagorder='$tagorder' ! and subfieldcode='$subfield' and subfieldorder='$subfieldorder "); } --- 694,698 ---- $dbh->do("delete from marc_subfield_table where bibid='$bibid' and tag='$tag' and tagorder='$tagorder' ! and subfieldcode='$subfield' and subfieldorder='$subfieldorder' "); } *************** *** 1435,1439 **** price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, --- 1434,1438 ---- price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! bulk =?, notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, *************** *** 1442,1446 **** $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'notforloan'}); } else { $sth=$dbh->prepare("Insert into items set --- 1441,1445 ---- $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); } else { $sth=$dbh->prepare("Insert into items set *************** *** 1451,1455 **** price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, --- 1450,1454 ---- price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! bulk = ? , notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, *************** *** 1458,1462 **** $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'notforloan'}); } if (defined $sth->errstr) { --- 1457,1461 ---- $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); } if (defined $sth->errstr) { *************** *** 1472,1477 **** # my $dbh=C4Connect; $item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'}; ! my $query="update items set barcode=?,itemnotes=? where itemnumber=?"; ! my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'itemnum'}); if ($item->{'barcode'} eq ''){ $item->{'notforloan'}=0 unless $item->{'notforloan'}; --- 1471,1476 ---- # my $dbh=C4Connect; $item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'}; ! my $query="update items set barcode=?,itemnotes=?,bulk=?,notforloan=? where itemnumber=?"; ! my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); if ($item->{'barcode'} eq ''){ $item->{'notforloan'}=0 unless $item->{'notforloan'}; *************** *** 1485,1491 **** homebranch=?, itemlost=?, ! wthdrawn=? where itemnumber=?"; ! @bind = ($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'itemnum'}); } if ($item->{'replacement'} ne ''){ --- 1484,1492 ---- homebranch=?, itemlost=?, ! wthdrawn=?, ! bulk=?, ! notforloan=?, where itemnumber=?"; ! @bind = ($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); } if ($item->{'replacement'} ne ''){ *************** *** 1557,1561 **** } $query =~ s/\,$//; - warn "Q 1560 : $query"; my $sth2=$dbh->prepare($query); $sth2->execute(@bind); --- 1558,1561 ---- *************** *** 1582,1586 **** #replacing the last , by ",?)" $query=~ s/\,$//; - warn "Q olddelbiblio : $query"; $sth=$dbh->prepare($query); $sth->execute(@bind); --- 1582,1585 ---- *************** *** 2193,2196 **** --- 2192,2208 ---- # $Id$ # $Log$ + # Revision 1.79 2004/02/11 08:40:09 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.78.2.3 2004/02/10 13:15:46 tipaul + # removing 2 warnings + # + # Revision 1.78.2.2 2004/01/26 10:38:06 tipaul + # dealing correctly "bulk" field + # + # Revision 1.78.2.1 2004/01/13 17:29:53 tipaul + # * minor html fixes + # * adding publisher in acquisition process (& ordering basket by publisher) + # # Revision 1.78 2003/12/09 15:57:28 tipaul # rolling back to working char_decode sub Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** BookShelves.pm 15 Dec 2003 10:57:08 -0000 1.11 --- BookShelves.pm 11 Feb 2004 08:40:09 -0000 1.12 *************** *** 145,163 **** #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! my $sth=$dbh->prepare("select * from shelfcontents ! where shelfnumber=? and itemnumber=?"); ! ! $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents ! (shelfnumber, itemnumber, flags) values (?, ?, 0)"); - # FIXME - The default for 'flags' is NULL. - # Why set it to 0? $sth->execute($shelfnumber, $itemnumber); ! } } --- 145,159 ---- #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! return unless $itemnumber; ! my $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); ! $sth->execute($shelfnumber, $itemnumber); ! } } *************** *** 244,247 **** --- 240,249 ---- # # $Log$ + # Revision 1.12 2004/02/11 08:40:09 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.11 2003/12/15 10:57:08 slef # DBI call fix for bug 662 Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** Catalogue.pm 17 Dec 2003 01:28:31 -0000 1.37 --- Catalogue.pm 11 Feb 2004 08:40:10 -0000 1.38 *************** *** 112,116 **** $sth->execute($basketno); } ! my @results = (); while (my $data=$sth->fetchrow_hashref){ push(@results,$data); --- 112,121 ---- $sth->execute($basketno); } ! $query.=" order by biblioitems.publishercode"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my @results; ! # print $query; ! my $i=0; while (my $data=$sth->fetchrow_hashref){ push(@results,$data); Index: Members.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Members.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Members.pm 15 Dec 2003 16:19:14 -0000 1.2 --- Members.pm 11 Feb 2004 08:40:10 -0000 1.3 *************** *** 67,73 **** my $autonumber_members = C4::Context->boolean_preference('autoMemberNum'); $autonumber_members = 0 unless defined $autonumber_members; - - warn "autoMemberNum is $autonumber_members\n"; - # Find out whether member numbers should be generated # automatically. Should be either "1" or something else. --- 67,70 ---- Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -r1.46 -r1.47 *** Output.pm 10 Feb 2004 00:43:21 -0000 1.46 --- Output.pm 11 Feb 2004 08:40:10 -0000 1.47 *************** *** 76,80 **** #FIXME: this is a quick fix to stop rc1 installing broken #Still trying to figure out the correct fix. ! my $path = C4::Context->config('intrahtdocs')."/intranet-tmpl/default/en/includes/"; #--------------------------------------------------------------------------------------------------------- --- 76,80 ---- #FIXME: this is a quick fix to stop rc1 installing broken #Still trying to figure out the correct fix. ! my $path = C4::Context->config('intrahtdocs')."/default/en/includes/"; #--------------------------------------------------------------------------------------------------------- Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -r1.85 -r1.86 *** Search.pm 14 Dec 2003 17:25:37 -0000 1.85 --- Search.pm 11 Feb 2004 08:40:10 -0000 1.86 *************** *** 1146,1150 **** } else { if ($type eq 'subject'){ ! $query .= "group by subject order by subject "; } } --- 1146,1150 ---- } else { if ($type eq 'subject'){ ! $query .= "order by subject group by subject "; } } *************** *** 1350,1358 **** } ! my $class = $data->{'classification'}; my $dewey = $data->{'dewey'}; $dewey =~ s/0+$//; ! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general ! # books about computer science if ($dewey < 10){$dewey='00'.$dewey;} if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;} --- 1350,1357 ---- } ! my $class = $data->{'classification'};# FIXME : $class is useless my $dewey = $data->{'dewey'}; $dewey =~ s/0+$//; ! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general books about computer science if ($dewey < 10){$dewey='00'.$dewey;} if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;} *************** *** 1378,1382 **** $sth->finish; #FIXME: ordering/indentation here looks wrong ! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=>"); $sth2->execute($biblionumber); my $data; --- 1377,1381 ---- $sth->finish; #FIXME: ordering/indentation here looks wrong ! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=?"); $sth2->execute($biblionumber); my $data; *************** *** 1949,1953 **** } #print $query; ! my $sth=$dbh->prepare(""); $sth->execute($bornum); my @result; --- 1948,1952 ---- } #print $query; ! my $sth=$dbh->prepare($query); $sth->execute($bornum); my @result; From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.24,1.25 itemtypes.pl,1.11,1.12 koha2marclinks.pl,1.10,1.11 thesaurus.pl,1.10,1.11 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/admin Modified Files: branches.pl itemtypes.pl koha2marclinks.pl thesaurus.pl Log Message: synch'ing 2.0.0 branch and head Index: branches.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/branches.pl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** branches.pl 12 Jan 2004 16:55:05 -0000 1.24 --- branches.pl 11 Feb 2004 08:40:10 -0000 1.25 *************** *** 79,83 **** } $template->param(action => $script_name); - if ($op eq 'add') { # If the user has pressed the "add new branch" button. --- 79,82 ---- Index: itemtypes.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** itemtypes.pl 12 Jan 2004 16:55:05 -0000 1.11 --- itemtypes.pl 11 Feb 2004 08:40:10 -0000 1.12 *************** *** 97,101 **** if ($itemtype) { my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge from itemtypes where itemtype=?"); $sth->execute($itemtype); $data=$sth->fetchrow_hashref; --- 97,101 ---- if ($itemtype) { my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan from itemtypes where itemtype=?"); $sth->execute($itemtype); $data=$sth->fetchrow_hashref; *************** *** 106,110 **** loanlength => $data->{'loanlength'}, renewalsallowed => $data->{'renewalsallowed'}, ! rentalcharge => $data->{'rentalcharge'}); ; # END $OP eq ADD_FORM --- 106,112 ---- loanlength => $data->{'loanlength'}, renewalsallowed => $data->{'renewalsallowed'}, ! rentalcharge => $data->{'rentalcharge'}, ! notforloan => $data->{'notforloan'} ! ); ; # END $OP eq ADD_FORM *************** *** 113,117 **** } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; ! my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge) values ("; $query.= $dbh->quote($input->param('itemtype')).","; $query.= $dbh->quote($input->param('description')).","; --- 115,119 ---- } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; ! my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan) values ("; $query.= $dbh->quote($input->param('itemtype')).","; $query.= $dbh->quote($input->param('description')).","; *************** *** 122,126 **** $query.= "1,"; } ! $query.= $dbh->quote($input->param('rentalcharge')).")"; my $sth=$dbh->prepare($query); $sth->execute; --- 124,133 ---- $query.= "1,"; } ! $query.= $dbh->quote($input->param('rentalcharge')).","; ! if ($input->param('notforloan') ne 1) { ! $query.= "0)"; ! } else { ! $query.= "1)"; ! } my $sth=$dbh->prepare($query); $sth->execute; Index: koha2marclinks.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/koha2marclinks.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** koha2marclinks.pl 12 Jan 2004 16:55:05 -0000 1.10 --- koha2marclinks.pl 11 Feb 2004 08:40:11 -0000 1.11 *************** *** 107,112 **** } #XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS ! my $sth2=$dbh->prepare("SHOW COLUMNS from ?"); ! $sth2->execute($tablename); my $toggle="white"; --- 107,112 ---- } #XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS ! my $sth2=$dbh->prepare("SHOW COLUMNS from $tablename"); ! $sth2->execute; my $toggle="white"; Index: thesaurus.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** thesaurus.pl 22 Dec 2003 19:16:58 -0000 1.10 --- thesaurus.pl 11 Feb 2004 08:40:11 -0000 1.11 *************** *** 258,265 **** father => $father); if ($offset>0) { ! $template->param(previous => "<< Prev"); } if ($pagesize<$count) { ! $template->param(next => "Next >>"); } } #---- END $OP eq DEFAULT --- 258,265 ---- father => $father); if ($offset>0) { ! $template->param(previous => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$prevpage"); } if ($pagesize<$count) { ! $template->param(next => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage"); } } #---- END $OP eq DEFAULT From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/acqui addorder.pl,1.16,1.17 basket.pl,1.16,1.17 newbiblio.pl,1.15,1.16 order.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui Modified Files: addorder.pl basket.pl newbiblio.pl order.pl Log Message: synch'ing 2.0.0 branch and head Index: addorder.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** addorder.pl 4 Sep 2003 17:29:50 -0000 1.16 --- addorder.pl 11 Feb 2004 08:40:11 -0000 1.17 *************** *** 49,53 **** my $title=$input->param('title'); my $author=$input->param('author'); ! my $copyright=$input->param('copyright'); my $isbn=$input->param('ISBN'); my $itemtype=$input->param('format'); --- 49,53 ---- my $title=$input->param('title'); my $author=$input->param('author'); ! my $copyrightdate=$input->param('copyrightdate'); my $isbn=$input->param('ISBN'); my $itemtype=$input->param('format'); *************** *** 72,78 **** my $budget=$input->param('budget'); my $cost=$input->param('cost'); ! my$sub=$input->param('sub'); my $invoice=$input->param('invoice'); ! if ($quantity ne '0'){ #check to see if biblio exists --- 72,78 ---- my $budget=$input->param('budget'); my $cost=$input->param('cost'); ! my $sub=$input->param('sub'); my $invoice=$input->param('invoice'); ! my $publishercode = $input->param('publishercode'); if ($quantity ne '0'){ #check to see if biblio exists *************** *** 81,90 **** $bibnum = &newbiblio({ title => $title?$title:"", author => $author?$author:"", ! copyright => $copyright?$copyright:"", series => $series?$series:"", }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" }); if ($title) { --- 81,91 ---- $bibnum = &newbiblio({ title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyrightdate?$copyrightdate:"", series => $series?$series:"", }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"", ! publishercode => $publishercode?$publishercode:"", }); if ($title) { *************** *** 98,102 **** $bibitemnum= &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" }); } &modbiblio({ --- 99,110 ---- $bibitemnum= &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" , ! publishercode => $publishercode?$publishercode:"", ! }); ! } else { ! &modbibitem({biblioitemnumber => $bibitemnum, ! isbn => $isbn, ! publishercode => $publishercode, ! }); } &modbiblio({ *************** *** 104,109 **** title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyright?$copyright:"", ! series => $series?$series:"" }); } if ($orderexists ne '') { --- 112,118 ---- title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyrightdate?$copyrightdate:"", ! series => $series?$series:"" }, ! ); } if ($orderexists ne '') { Index: basket.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/basket.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** basket.pl 17 Sep 2003 13:33:37 -0000 1.16 --- basket.pl 11 Feb 2004 08:40:11 -0000 1.17 *************** *** 78,81 **** --- 78,82 ---- } $line{ordernumber} = $results[$i]->{'ordernumber'}; + $line{publishercode} = $results[$i]->{'publishercode'}; $line{isbn} = $results[$i]->{'isbn'}; $line{booksellerid} = $results[$i]->{'booksellerid'}; Index: newbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** newbiblio.pl 22 Dec 2003 19:16:59 -0000 1.15 --- newbiblio.pl 11 Feb 2004 08:40:11 -0000 1.16 *************** *** 170,174 **** ecost => $data->{'ecost'}, notes => $data->{'notes'}, ! barcode => $data->{'barcode'},); output_html_with_http_headers $input, $cookie, $template->output; --- 170,175 ---- ecost => $data->{'ecost'}, notes => $data->{'notes'}, ! barcode => $data->{'barcode'}, ! publishercode => $data->{'publishercode'}); output_html_with_http_headers $input, $cookie, $template->output; Index: order.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/order.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** order.pl 8 Jul 2003 16:20:15 -0000 1.9 --- order.pl 11 Feb 2004 08:40:11 -0000 1.10 *************** *** 64,67 **** --- 64,68 ---- $line{id} =$suppliers[$i]->{'id'}; $line{name} = $suppliers[$i]->{'name'}; + $line{active} = $suppliers[$i]->{'active'}; $line{total} = $orders->[0]->{'count(*)'}; $line{authorisedby} = $orders->[0]->{'authorisedby'}; From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/C4 Authorities.pm,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/C4 Modified Files: Authorities.pm Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: Authorities.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Authorities.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Authorities.pm 15 Dec 2003 14:38:59 -0000 1.7 --- Authorities.pm 11 Feb 2004 08:42:02 -0000 1.8 *************** *** 193,199 **** } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " order by category,freelib limit ?,?"; push(@bind,$offset,($pagesize*4)); ! # warn "q : $query"; my $sth=$dbh->prepare($query); $sth->execute(@bind); --- 193,199 ---- } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " limit ?,?"; push(@bind,$offset,($pagesize*4)); ! warn "q : $query". at bind; my $sth=$dbh->prepare($query); $sth->execute(@bind); *************** *** 219,223 **** $cnt = $pagesize+1 if ($cnt>$pagesize); $sth->finish(); ! return ($cnt,\@results); } --- 219,223 ---- $cnt = $pagesize+1 if ($cnt>$pagesize); $sth->finish(); ! return ($#results,\@results); } From tipaul at users.sourceforge.net Wed Feb 11 09:42:05 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:05 -0800 Subject: [Koha-cvs] CVS: koha/misc rebuildthesaurus.pl,1.1,1.2 release_notes_191.txt,1.1,1.2 release_notes_192.txt,1.1,1.2 release_notes_193.txt,1.1,1.2 release_notes_200pre1.txt,1.1,1.2 release_notes_200pre2.txt,1.1,1.2 release_notes_200pre3.txt,1.1,1.2 release_notes_200pre4.txt,1.1,1.2 release_notes_200pre5.txt,1.1,1.2 release_notes_200RC1.txt,1.1,1.2 release_notes_200RC2.txt,1.1,1.2 release_notes_200RC3.txt,1.1,1.2 release_notes_200RC4.txt,1.1,1.2 Install.pm,1.71,1.72 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/misc Modified Files: Install.pm Added Files: rebuildthesaurus.pl release_notes_191.txt release_notes_192.txt release_notes_193.txt release_notes_200pre1.txt release_notes_200pre2.txt release_notes_200pre3.txt release_notes_200pre4.txt release_notes_200pre5.txt release_notes_200RC1.txt release_notes_200RC2.txt release_notes_200RC3.txt release_notes_200RC4.txt Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** Install.pm 9 Feb 2004 22:36:32 -0000 1.71 --- Install.pm 11 Feb 2004 08:42:01 -0000 1.72 *************** *** 378,382 **** =cut ! sub getkohaversion ($) { return($kohaversion); } --- 378,382 ---- =cut ! sub getkohaversion () { return($kohaversion); } *************** *** 990,993 **** --- 990,994 ---- foreach my $mysql (qw(/usr/local/mysql /opt/mysql + /usr/local /usr )) { *************** *** 1149,1152 **** --- 1150,1154 ---- /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf + /etc/apache/httpd.conf /etc/apache-ssl/conf/apache.conf /etc/apache-ssl/httpd.conf From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.66,1.67 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/circ Modified Files: circulation.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** circulation.pl 26 Jan 2004 19:32:36 -0000 1.66 --- circulation.pl 11 Feb 2004 08:42:02 -0000 1.67 *************** *** 410,413 **** --- 410,428 ---- color => $color, ); + if ($flag eq 'GNA'){ + $template->param( + gna => 'true' + ); + } + if ($flag eq 'LOST'){ + $template->param( + lost => 'true' + ); + } + if ($flag eq 'DBARRED'){ + $template->param( + dbarred => 'true' + ); + } if ($flag eq 'CHARGES') { $template->param( From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac-css.fr,1.1,1.2 intranet.en,1.1,1.2 intranet.fr,1.1,1.2 opac.fr,1.4,1.5 tmpl_process.pl,1.9,1.10 translator_doc.txt,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/misc/translator Modified Files: intranet.en intranet.fr opac.fr tmpl_process.pl translator_doc.txt Added Files: opac-css.fr Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: intranet.en =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.en,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.en 9 Dec 2003 10:26:51 -0000 1.1 --- intranet.en 11 Feb 2004 08:42:01 -0000 1.2 *************** *** 1,7 **** ! 0 ***** ! A ***** ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table. ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically. ***** ! A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm. ***** About ***** Abstract ***** --- 1,4 ---- ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically ***** [...1295 lines suppressed...] Yes ***** yes ***** + YES ***** Yes, See below ***** YesNo ***** You ***** ! You are accessing Koha from a different ip address! Please login again ***** You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from! ***** You did not specify any seach criteria ***** ! You entered an incorrect username or password. Please try again ***** You have error(s) in your MARC configuration. Please fix them before using koha ***** You have the following books waiting to be picked up ***** *************** *** 1110,1114 **** You searched on ***** Young Adult Fiction ***** - Z ***** Z39.50 Search ***** Z39.50 Server ***** --- 1082,1085 ---- Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.fr 9 Dec 2003 10:26:51 -0000 1.1 --- intranet.fr 11 Feb 2004 08:42:02 -0000 1.2 *************** *** 1,874 **** ! 0 ***** ! A ***** ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table. ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically. ***** ! A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm. ***** ! About ***** ! Abstract ***** ! Account for ***** ! Account Management Fee ***** ! ACCOUNTING DETAILS ***** [...2154 lines suppressed...] ! You are accessing Koha from a different ip address! Please login again Vous avez changé d'adresse IP. Identifiez-vous à nouveau ! You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from! Vous pouvez nommer ce fichier d'importation. Cela peut servir lors de la création de notice biblio pour se souvenir d'où viennent les données MARC par défaut. ! You did not specify any seach criteria Vous n'avez pas spécifié de critère ! You entered an incorrect username or password. Please try again Identifiant ou mot de passe erroné. Essayez encore ! You have Vous avez ! You have the following books waiting to be picked up Vous avez les livres suivants en attente ! You have the following requests for items on loan Vous avez les demandes suivantes pour des ouvrages en prêt ! You must create a new group for your item to be added to Vous devez créer un nouveau groupe pour ajouter vos ouvrages ! You must give the item a barcode Vous devez attribuer un code barre à l'ouvrage ! You searched for Votre recherche sur ! You Searched for Votre recherche sur ! You searched on Recherche effectuée sur ! Young Adult Fiction Fiction Ados ! Z39.50 Search Recherche Z39.50 ! Z39.50 Server Serveur Z39.50 ! Z39.50 Servers Serveurs Z39.50 ! Z39.50 Servers admin Admin Serveurs Z39.50 ! z3950 search Recherche Z39.50 ! Z3950 Search Results Résultats Recherche Z39.50 ! Zipcode / Town Code postal / Localité Index: opac.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.fr,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac.fr 9 Dec 2003 10:26:51 -0000 1.4 --- opac.fr 11 Feb 2004 08:42:02 -0000 1.5 *************** *** 5,12 **** Advanced Search, More Options Recherche avancée AMOUNT COUT An Error has Occurred Une erreur s'est produite Any Tout Apr Avril - Are any of our records incorrect? Have you moved recently, got a new phone number or e-mail address? Un changement à nous faire connaitre ? ARE OUR RECORDS CORRECT? Est-ce correct Aug Aout --- 5,12 ---- Advanced Search, More Options Recherche avancée AMOUNT COUT + An error has occurred ***** An Error has Occurred Une erreur s'est produite Any Tout Apr Avril ARE OUR RECORDS CORRECT? Est-ce correct Aug Aout *************** *** 15,21 **** BARCODE CODE BARRE Barcode Code barre ! bgcolor='#ffffcc'> ***** Biblio number Notice biblio : - BIBLIO RECORD Notice bibliographique Biblionumber Numéro notice : Cancelled Annul? --- 15,20 ---- BARCODE CODE BARRE Barcode Code barre ! bgcolor="#ffffcc"> ***** Biblio number Notice biblio : Biblionumber Numéro notice : Cancelled Annul? *************** *** 45,58 **** Email Mail End reserve on this date Annuler réservation à cette date - Exact Exact exact exact Feb Fev Fiction Fiction FINES & CHARGES Dettes Firstname Prénom - Free Software ILS SIGB sous licence libre GROUP - GROUPE Group Number Groupe numéro - Hi Bonjour, Home Accueil Home Branch Annexe propriétaire --- 44,55 ---- Email Mail End reserve on this date Annuler réservation à cette date exact exact + Exact Exact Feb Fev Fiction Fiction FINES & CHARGES Dettes Firstname Prénom GROUP - GROUPE Group Number Groupe numéro Home Accueil Home Branch Annexe propriétaire *************** *** 61,73 **** Illus Illus Illustrator Illustrateur ! in dans ! in Maori en langue Maori in the last dans les derniers ISBN ISBN Item Count Nombre d'ouvrages Item lost Ouvrage perdu ! Item Type Type d'ouvrage : ! items currently issued. Ouvrage en prêt actuellement ! items currently reserved. Ouvrages réservés actuellement Itemtype Type d'ouvrage Jan Jan --- 58,69 ---- Illus Illus Illustrator Illustrateur ! in en in the last dans les derniers ISBN ISBN Item Count Nombre d'ouvrages Item lost Ouvrage perdu ! Item Type Type d'ouvrage ! items currently issued Ouvrage en prêt actuellement ! items currently reserved Ouvrages réservés actuellement Itemtype Type d'ouvrage Jan Jan *************** *** 79,96 **** Junior Non-Fiction Junior NF Keywords Mot-clefs - Koha Koha KOHA KOHA - Koha : a gift, a contribution Koha : un don, une contribution Koha Login Identifiant Koha - KOHA: Become a Member KOHA : s'inscrire - KOHA: Catalogue Search Recherche catalogue - Koha: Horowhenua Library Trust Catalogue and Member Services Koha, catalogue et outils abonnés - KOHA: Members Area Zone abonnés KOHA: OPAC Catalogue Search Recherche OPAC Last borrowed Dernier prêt Last Borrower 1 Dernier emprunteur 1 Last Borrower 2 Dernier emprunteur 2 - Last Seen Vu Last seen Vu Library Card Carte lecteur Loan Length Durée prêt --- 75,86 ---- Junior Non-Fiction Junior NF Keywords Mot-clefs KOHA KOHA Koha Login Identifiant Koha KOHA: OPAC Catalogue Search Recherche OPAC Last borrowed Dernier prêt Last Borrower 1 Dernier emprunteur 1 Last Borrower 2 Dernier emprunteur 2 Last seen Vu + Last Seen Vu Library Card Carte lecteur Loan Length Durée prêt *************** *** 100,106 **** Log Out Déconnecter Logged in as Connecté en tant que - Logged in as: [ ***** - login Connecter - Logout Déconnecter Mar Mars May Mai --- 90,93 ---- *************** *** 108,113 **** modify Modifier Month Mois - Next Records Enregistrement suivant - No Non No. of Items N° ouvrage Non-Fiction NF --- 95,98 ---- *************** *** 131,146 **** Paid for Payé pour : Password Mot de passe : ! pick up at Prendre à : Place Placer Place Reserve Réserver Please confirm that you wish to request an item of these types Confirmez que vous souhaitez réserver un ouvrage : Please select the branch from which you want to collect the item Sélectionnez l'annexe ou vous prendrez l'ouvrage ! Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you. Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous. ! Please, change what's needed. An email will be sent to the library. Changer le nécessaire ! Previous Records Précédents Published by Publié par Publisher Editions Recent acquisitions Acquisitions récentes ! records. réponses Reference Books Références Renewals Renouvellements --- 116,131 ---- Paid for Payé pour : Password Mot de passe : ! Pick Up Branch Annexe de retrait Place Placer Place Reserve Réserver + Please change what's needed. An email will be sent to the library Changer le nécessaire Please confirm that you wish to request an item of these types Confirmez que vous souhaitez réserver un ouvrage : Please select the branch from which you want to collect the item Sélectionnez l'annexe ou vous prendrez l'ouvrage ! Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous. Published by Publié par Publisher Editions Recent acquisitions Acquisitions récentes ! record Enr. ! records réponses Reference Books Références Renewals Renouvellements *************** *** 151,173 **** Reserve on this date Réserver à cette date : Reserve page for item Réservation de l'ouvrage : ! reserves already on this item. Réservations déjà faites sur cet ouvrage ! reserves. Réservations Results Résultats ! Results through of records. ***** results found Réponses trouvées ! search IGNORE ! Search IGNORE Search the catalogue Chercher dans le catalogue - Search the Catalogue Chercher dans le catalogue Sep Sep Serial Périodique Size Taille Something new ? quelque chose à modifier ? ! Sorry, KOHA doesnt think you have permission for this page. Désolé, je pense que vous n'avez pas les permissions suffisantes. Sorry, there were no results Désolé, aucun résultat ! ! Sorry, you cannot make more than Impossible de faire plus de ! Sorry, you cannot make more than reserves. Désolé, vous ne pouvez pas faire plus de réservations ! Sorry, you cannot make reserves because you owe . Désolé, vous ne pouvez pas faire de réservation parce que vous devez ! Sorry, your session has timed out, please login again. Déconnecté. Identifiez vous à nouveau. STILL OWING EN ATTENTE Street address Adresse postale --- 136,155 ---- Reserve on this date Réserver à cette date : Reserve page for item Réservation de l'ouvrage : ! reserves already on this item Réservations déjà faites sur cet ouvrage Results Résultats ! Results through of records ***** results found Réponses trouvées ! Search LIMITED;Chercher ! search LIMITED;recherche Search the catalogue Chercher dans le catalogue Sep Sep Serial Périodique Size Taille Something new ? quelque chose à modifier ? ! Sorry, KOHA doesnt think you have permission for this page Désolé, je pense que vous n'avez pas les permissions suffisantes. Sorry, there were no results Désolé, aucun résultat ! ! Sorry, you cannot make more than reserves Désolé, vous ne pouvez pas faire plus de réservations ! Sorry, you cannot make reserves because you owe Désolé, vous ne pouvez pas faire de réservation parce que vous devez ! Sorry, your session has timed out, please login again Déconnecté. Identifiez vous à nouveau STILL OWING EN ATTENTE Street address Adresse postale *************** *** 177,181 **** Surname Nom Teacher Reference Ref. prof. ! text/html; charset=iso8859-1 text/html; charset=iso8859-1 There are Il y a through à --- 159,163 ---- Surname Nom Teacher Reference Ref. prof. ! text/html; charset=iso-8859-1 text/html; charset=iso8859-1 There are Il y a through à *************** *** 184,189 **** Total Due Total dû Total Number of Items Nombre total d'exemplaires ! Try another Essayez un autre ! Type in the box and press the enter key. Saisissez et validez avec Entrée Unititle Titre unifié Update Record Mettre à jour --- 166,171 ---- Total Due Total dû Total Number of Items Nombre total d'exemplaires ! Try another Essayez une autre ! Type in the box and press the enter key Saisissez et validez avec Entrée Unititle Titre unifié Update Record Mettre à jour *************** *** 196,216 **** Work/Fax phone Tel bureau Year Année - Year : Année : - Yes Oui YesNo OuiNon ! You already have a reserve placed on this item. Vous avez déjà placé une réservation sur cet exemplaire ! You are accessing koha from a different ip address! please login again. Vous avez changé d'adresse IP. Identifiez vous à nouveau ! You did not specify any seach criteria Vous n'avez pas spécifié de critère ! You entered an incorrect username or password, please try again. Identifiant ou mot de passe erroné. Essayez encore. ! You have Vous avez ! You have items currently issued. Vous avez exemplaires en prêt ! You have items currently reserved. Vous avez exemplaires réservés You have a credit of Vous avez un crédit de ! You have no items on issue. Vous n'avez pas d'exemplaire en prêt You have outstanding charges and fines of Vous avez des dettes de You have reserved items waiting Vous avez des réservations en attente You must select a branch for pickup! Sélectionnez une annexe ou retirer l'ouvrage ! You must select at least on item type! Vous devez sélectionner au moins 1 type d'exemplaire You searched on Recherche effectuée sur Young Adult Fiction Ado fiction ! Your changes won't appear until the library has validated them. Vos changement n'apparaitront que lorsque la bibliothèque les aura validé --- 178,195 ---- Work/Fax phone Tel bureau Year Année YesNo OuiNon ! You already have a reserve placed on this item Vous avez déjà placé une réservation sur cet exemplaire ! You are accessing koha from a different ip address! please login again Vous avez changé d'adresse IP. Identifiez vous à nouveau ! You did not specify any search criteria Vous n'avez pas spécifié de critère ! You entered an incorrect username or password, please try again Identifiant ou mot de passe erroné. Essayez encore. ! You have items currently issued Vous avez exemplaires en prêt ! You have items currently reserved Vous avez exemplaires réservés You have a credit of Vous avez un crédit de ! You have no items on issue Vous n'avez pas d'exemplaire en prêt You have outstanding charges and fines of Vous avez des dettes de You have reserved items waiting Vous avez des réservations en attente You must select a branch for pickup! Sélectionnez une annexe ou retirer l'ouvrage ! You must select at least one item type! Vous devez sélectionner au moins 1 type d'exemplaire You searched on Recherche effectuée sur Young Adult Fiction Ado fiction ! Your changes won't appear until the library has validated them Vos changement n'apparaitront que lorsque la bibliothèque les aura validé Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** tmpl_process.pl 10 Feb 2004 09:42:18 -0000 1.9 --- tmpl_process.pl 11 Feb 2004 08:42:02 -0000 1.10 *************** *** 74,78 **** { # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char); # updates the list, adding new entries if any %strhash = &update_strhash(\%strhash, \@in_files, $exclude_regex, $filter); --- 74,78 ---- { # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char,1); # updates the list, adding new entries if any %strhash = &update_strhash(\%strhash, \@in_files, $exclude_regex, $filter); *************** *** 94,98 **** # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char); # creates the new tmpl file using the new translation &install_strhash(\%strhash, \@in_files, $in_dir, $out_dir); --- 94,98 ---- # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char,0); # creates the new tmpl file using the new translation &install_strhash(\%strhash, \@in_files, $in_dir, $out_dir); *************** *** 116,121 **** my $tmp_dir; # temporary directory name (used to create destination dir) ! $out_dir =~ s/\/$//; # chops the trailing / if any. # Processes every entry found. foreach my $file (@{$in_files}) --- 116,122 ---- my $tmp_dir; # temporary directory name (used to create destination dir) ! my $starttime = time(); + $out_dir =~ s/\/$//; # chops the trailing / if any. # Processes every entry found. foreach my $file (@{$in_files}) *************** *** 129,132 **** --- 130,134 ---- # generates the name of the output file my $out_file = $file; + my $out_file_tmp = $file.".tmp"; # used to check if file has changed or not. if(!defined $in_dir) *************** *** 159,198 **** exit(1); } ! # opens handle for output ! if( !open($fh_out, "> $out_file") ) { ! warn "Can't write $out_file : $!\n"; close($fh_in); next; } ! ! print "Generating $out_file...\n"; ! while(my $line = <$fh_in>) { ! foreach my $text (sort {length($b) <=> length($a)} keys %{$strhash}) { ! # Test if the key has been translated ! if( %{$strhash}->{$text} != 1 ) { ! # Does the line contains text that needs to be changed ? ! if( $line =~ /$text/ && %{$strhash}->{$text} ne "IGNORE") { # changing text ! my $subst = %{$strhash}->{$text}; ! $line =~ s/(\W)$text(\W)/$1$subst$2/g; } } } - $line =~ s/\/\<\!-- TMPL_$1 --\>/g; - $line =~ s/\<\/TMPL_(.*?)\>/\<\!-- \/TMPL_$1 --\>/g; - # Writing the modified (or not) line to output - printf($fh_out "%s", $line); } ! close($fh_in); close($fh_out); } } --- 161,243 ---- exit(1); } ! # opens handle for output ! if( !open($fh_out, "> $out_file_tmp") ) { ! warn "Can''t write $out_file : $!\n"; close($fh_in); next; } ! my $lines; while(my $line = <$fh_in>) { ! $lines.=$line; ! } ! foreach my $text (sort {length($b) <=> length($a) || uc($b) cmp uc($a) } keys %{$strhash}) ! { ! # Test if the key has been translated ! if( %{$strhash}->{$text} != 1) { ! # Does the file contains text that needs to be changed ? ! # escaping \|()[{}^$*+?. ! my $subst = %{$strhash}->{$text}; ! $text =~ s/\\/\\\\/g; ! $text =~ s/\//\\\//g; ! $text =~ s/\|/\\\|/g; ! $text =~ s/\(/\\\(/g; ! $text =~ s/\)/\\\)/g; ! $text =~ s/\[/\\\[/g; ! $text =~ s/\]/\\\]/g; ! $text =~ s/\{/\\\{/g; ! $text =~ s/\}/\\\}/g; ! $text =~ s/\^/\\\^/g; ! $text =~ s/\$/\\\$/g; ! $text =~ s/\*/\\\*/g; ! $text =~ s/\+/\\\+/g; ! $text =~ s/\?/\\\?/g; ! $text =~ s/\./\\\./g; ! if(%{$strhash}->{$text} ne "IGNORE" ) { ! if (%{$strhash}->{$text} =~ "LIMITED") { # changing text ! $subst =~ s/UNUSED;//; ! $subst =~ s/^LIMITED;//g; ! $lines =~ s/(.*)>$text(\W)/$1>$subst$2/g; ! $lines =~ s/(.*) title="$text/$1 title="$subst/g; ! $lines =~ s/(.*) alt="$text/$1 alt="$subst/g; ! } else { ! # changing text ! $subst =~ s/UNUSED;//; ! $lines =~ s/(\W)$text(\W)/$1$subst$2/g; } } } } ! $lines =~ s/\/\<\!-- TMPL_$1 --\>/g; ! $lines =~ s/\<\/TMPL_(.*?)\>/\<\!-- \/TMPL_$1 --\>/g; ! # Writing the modified (or not) file to output ! printf($fh_out "%s", $lines); close($fh_in); close($fh_out); + # check if fh_out and previous fh_out has changed or not. + my $diff; + if(-f $out_file) { + $diff = `diff $out_file $out_file_tmp`; + } else { + $diff = "write it, it's new"; + } + if ($diff) { + print "WRITING : $out_file\n"; + unlink $out_file; + system("mv $out_file_tmp $out_file"); + } else { + print "no changes in $out_file\n"; + unlink $out_file_tmp; + } } + my $timeneeded = time() - $starttime; + print "done in $timeneeded seconds\n"; + } *************** *** 213,217 **** print "Processing $in...\n"; ! # Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; --- 258,262 ---- print "Processing $in...\n"; ! # 'Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; *************** *** 222,227 **** { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^\s+//; # remove trailing blanks, ':' or '*' ! $str =~ s/\s*\**:*\s*$//; # the line begins with letter(s) followed by optional words and/or spaces --- 267,272 ---- { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^[\s+:\(]*//; # remove useless characters ! $str =~ s/[\s\*:\[*\(|\.,\)]*$//; # the line begins with letter(s) followed by optional words and/or spaces *************** *** 235,238 **** --- 280,286 ---- # the line is not already in the list so add it %{$strhash}->{$str}=1; + } else { + # remove UNUSED; + %{$strhash}->{$str} =~ s/^UNUSED;//; } } *************** *** 252,257 **** sub restore_strhash { ! my($strhash, $str_file, $split_char) = @_; ! my $fh; --- 300,305 ---- sub restore_strhash { ! my($strhash, $str_file, $split_char, $detect_unused) = @_; ! my $fh; *************** *** 259,263 **** print "Restoring string list from $str_file...\n"; ! while( my $line = <$fh> ) { --- 307,311 ---- print "Restoring string list from $str_file...\n"; ! while( my $line = <$fh> ) { *************** *** 277,280 **** --- 325,331 ---- %{$strhash}->{$original} = 1; } + if ($detect_unused) { + %{$strhash}->{$original} = "UNUSED;".%{$strhash}->{$original} unless %{$strhash}->{$original}=~ /^UNUSED;/; + } } *************** *** 300,306 **** print "Writing string list to $str_file...\n"; ! foreach my $str(sort {uc($a) cmp uc($b) || length($a) <=> length($b)} keys %{$strhash}) { ! if(%{$strhash}->{$str} != 1) { printf($fh "%s%s%s\n", $str, $split_char, %{$strhash}->{$str}); --- 351,357 ---- print "Writing string list to $str_file...\n"; ! foreach my $str(sort {uc($a) cmp uc($b) || length($b) <=> length($a)} keys %{$strhash}) { ! if(%{$strhash}->{$str}!=1) { printf($fh "%s%s%s\n", $str, $split_char, %{$strhash}->{$str}); *************** *** 308,312 **** else { ! printf($fh "%s%s%s\n", $str, $split_char,"*****") unless ($str >0); } } --- 359,363 ---- else { ! printf($fh "%s%s%s\n", $str, $split_char,"*****") unless ($str >0 || length($str) eq 1); } } *************** *** 457,458 **** --- 508,510 ---- exit(0); } + Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** translator_doc.txt 5 Dec 2003 16:53:46 -0000 1.1 --- translator_doc.txt 11 Feb 2004 08:42:02 -0000 1.2 *************** *** 1,3 **** ! TRANSLATION TOOL : ============ This transation tool should greatly help Koha translators. --- 1,3 ---- ! TRANSLATION TOOL , V2.0: ============ This transation tool should greatly help Koha translators. *************** *** 15,25 **** ============ 1- create your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & french being separated by a tab 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version, go back to pt1 & repeat. WEAKNESSES --- 15,31 ---- ============ 1- create your translation file : ! ./tmpl_process.pl create -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images/css files in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version : ! 1- update your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate new your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) ! 3- create your translated version : ! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy new images/css files in your new directory if needed WEAKNESSES *************** *** 39,44 **** words that are in the templates and in a perl script name are replaced ! For example : Search is replace by Recherche in french, thus,giving , which is wrong... ! The only way I've found to solve this is to ignore any translation whose translation string is IGNORE ! (search is the only cas i've found in french opac) - MISSING STRINGS --- 45,61 ---- words that are in the templates and in a perl script name are replaced ! For example : Search is replace by Recherche in french, thus,giving , which is wrong... ! 2 ways to solve this problem, IGNORE & LIMITED pragma. ! IGNORE : ! if a line in translation file is : ! this_original_string IGNORE ! it is ignored during translation. ! LIMITED : ! if a line in translation file is : ! this_original_string LIMITED;the_translation_string ! The string is translated only if : ! * has a > just before ! * has title=" just before ! * has alt=" just before. ! This prevent stupid replaces, at the cost of some missing translation maybe. - MISSING STRINGS From tipaul at users.sourceforge.net Wed Feb 11 09:46:07 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:46:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-main.tmpl,1.2,1.3 opac-user.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24748/koha-tmpl/opac-tmpl/vanilla/en Modified Files: opac-main.tmpl opac-user.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 18 Mar 2003 19:52:36 -0000 1.2 --- opac-main.tmpl 11 Feb 2004 08:46:05 -0000 1.3 *************** *** 162,166 ****

    For more information on the koha libary system
    ! vist     www.koha.org

    \ No newline at end of file --- 162,166 ----

    For more information on the koha libary system
    ! visit www.koha.org

    \ No newline at end of file Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-user.tmpl 18 Mar 2003 19:52:37 -0000 1.2 --- opac-user.tmpl 11 Feb 2004 08:46:05 -0000 1.3 *************** *** 139,144 **** ! Renew Not renewable --- 139,148 ---- ! ! ! Not renewable ! Renew + Not renewable *************** *** 227,231 **** ! Renew --- 231,235 ---- ! Renew From tipaul at users.sourceforge.net Wed Feb 11 09:44:31 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:31 -0800 Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_210c.pl,1.3,1.4 unimarc_field_225a.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/value_builder Modified Files: unimarc_field_210c.pl unimarc_field_225a.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: unimarc_field_210c.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_210c.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** unimarc_field_210c.pl 1 Aug 2003 14:20:51 -0000 1.3 --- unimarc_field_210c.pl 11 Feb 2004 08:44:28 -0000 1.4 *************** *** 78,82 **** $res .= " ]; ! // search isbn subfield. it's 010a var isbn_found; for (i=0 ; iparam("result"); ! print "Content-Type: text/html\n\n"; exit; } --- 115,122 ---- my ($input) = @_; my $index = $input->param("index"); ! my $result = $input->param("result"); ! $result=~s/ / /g; ! $result=~s/"/"/g; ! print "Content-Type: text/html\n\n"; exit; } Index: unimarc_field_225a.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** unimarc_field_225a.pl 23 Jun 2003 11:27:49 -0000 1.5 --- unimarc_field_225a.pl 11 Feb 2004 08:44:29 -0000 1.6 *************** *** 120,124 **** my @collections; if ($isbn_found) { ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS'"); my @splited = split //, $isbn_found; my $isbn_rebuild=''; --- 120,124 ---- my @collections; if ($isbn_found) { ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS' order by stdlib"); my @splited = split //, $isbn_found; my $isbn_rebuild=''; *************** *** 132,136 **** } else { # if there is no isbn, search with % ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS'"); $sth->execute("\%$authoritysep $editor_found $authoritysep"); while (my ($line)= $sth->fetchrow) { --- 132,136 ---- } else { # if there is no isbn, search with % ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib"); $sth->execute("\%$authoritysep $editor_found $authoritysep"); while (my ($line)= $sth->fetchrow) { From tipaul at users.sourceforge.net Wed Feb 11 09:44:30 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:30 -0800 Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.10,1.11 search.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/z3950 Modified Files: processz3950queue search.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: processz3950queue =================================================================== RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** processz3950queue 6 Nov 2003 15:08:40 -0000 1.10 --- processz3950queue 11 Feb 2004 08:44:28 -0000 1.11 *************** *** 11,14 **** --- 11,91 ---- use Net::Z3950; + =head1 NAME + + processz3950queue. The script that does z3950 searches. + + =head1 SYNOPSIS + + This script can be used on a console (as normal user) or by the daemon-launch script. + + Don't forget to EXPORT PERL5LIB=/PATH/to/KOHA before executing it if you use console mode. + + It : + 1- extracts z3950 requests from z3950queue table, + 2- creates entries in z3950results to store the result + 3- launch z3950 queries in asynchronous mode, using Unix fork() + 4- store results in marc_breeding table. + + The z3950 results queries are managed in z3950/search.pl script (poped-up window in MARC editor). + + =head1 DESCRIPTION + + =head2 table z3950servers + + This table stores the differents z3950 servers. + A server is used if checked=1. The rank is NOT used as searches are now asynchronous. + + =head2 table z3950queue + + Table use to manage queries. A single line is created in this table for each z3950 search request. + If more than 1 server is called, the C field containt all of them separated by |. + + z3950 search requests are done by z3950/search.pl script. + At this stage, the fields are created with C and C empty + + Then, the processz3950queue finds this entry and : + 1- store date (time()) in C + 2- set C = -1 + + when the requests are all sent : + 2- set C = 1 + 3- set C (FIXME: always equal to startdate for me) + + entries are deleted when : + - C is more than 1 day ago. + + FIXME: + - results, numrecords fields are unused + + =head2 table z3950results + + 1 entry is created for each request, for each server called. + when created : + * C is filled + * C is null + * active is set to 0. when active is 0, it means the request has not been sent. when set to 1, it means it's on the way. + + When a search is ended, C is set, and C is set to -1 + + =head1 How it's written + + on every loop : + * delete old queries + * for each entry in z3950queue table that is not done=1 { + for each search request { + for each server { + try to connect + look for results + * results can be : + - existing and already running on another process (active=1) + - existing & finished (active=-1) + - non existent => create it and run the request. + } + } + } + =over 2 + + =cut + if ($< == 0) { *************** *** 30,34 **** my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("update z3950results set active=0"); $sth->execute; $sth->finish; --- 107,112 ---- my $dbh = C4::Context->dbh; ! # we begin the script, so "unactive" every pending request : they will never give anything, the script died :-( ! my $sth=$dbh->prepare("update z3950results set active=0 where active<>-1"); $sth->execute; $sth->finish; *************** *** 52,106 **** print "starting loop\n"; $checkqueue = 1; # FIXME during testing, this line forces the loop. REMOVE it to use SIG{HUP} when "daemonized" ! if ($checkqueue) { # everytime a SIG{HUP} is recieved $checkqueue=0; ! my $sth=$dbh->prepare("select id,term,type,servers,identifier from z3950queue order by id"); $sth->execute; while (my ($id, $term, $type, $servers,$random) = $sth->fetchrow) { if ($forkcounter<12) { my $now=time(); my $stk=$dbh->prepare("select id,server,startdate,enddate,numrecords,active from z3950results where queryid=?"); ($stk->execute($id)) || (next); my %serverdone; unless ($stk->rows) { my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=? where id=?"); $sti->execute($now,$id); } while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) { ! if ($r_enddate >0) { $serverdone{$r_server}=1; ! } elsif ($active) { $serverdone{$r_server}=1; ! } else { $serverdone{$r_server}=-1; } } - $stk->finish; ! my $attr=''; ! if ($type eq 'isbn') { ! $attr='1=7'; ! } elsif ($type eq 'title') { ! $attr='1=4'; ! } elsif ($type eq 'author') { ! $attr='1=1003'; ! } elsif ($type eq 'lccn') { ! $attr='1=9'; ! } elsif ($type eq 'keyword') { ! $attr='1=1016'; ! } ! $term='"'.$term.'"'; ! my $query="\@attr $attr $term"; ! my $totalrecords=0; ! my $serverinfo; ! my $stillprocessing=0; ! my $globalname; ! my $globalsyntax; ! my $globalencoding; ! foreach $serverinfo (split(/\|/, $servers)) { ! (next) if ($serverdone{$serverinfo} == 1); ! my $stillprocessing=1; if (my $pid=fork()) { $forkcounter++; } else { my $dbi = C4::Context->dbh; my ($name, $server, $database, $user, $password,$syntax) = split(/\//, $serverinfo, 6); --- 130,183 ---- print "starting loop\n"; $checkqueue = 1; # FIXME during testing, this line forces the loop. REMOVE it to use SIG{HUP} when "daemonized" ! + # clean DB + my $now = time(); + # delete z3950queue entries that are more than 1 day old + my $sth = $dbh->prepare("delete from z3950queue where ?-startdate > 86400"); + $sth->execute($now); + # delete z3950results queries that are more than 1 hour old + $sth = $dbh->prepare("delete from z3950results where ?-startdate > 3600"); + $sth->execute($now); if ($checkqueue) { # everytime a SIG{HUP} is recieved $checkqueue=0; ! # parse every entry in QUEUE ! $sth=$dbh->prepare("select id,term,type,servers,identifier from z3950queue where done<>1 or done is null order by id"); $sth->execute; while (my ($id, $term, $type, $servers,$random) = $sth->fetchrow) { + # FIXME: there is no "else". So, if more than 12 requests at the same time => requests are lost ! if ($forkcounter<12) { my $now=time(); + # search for results entries for this request my $stk=$dbh->prepare("select id,server,startdate,enddate,numrecords,active from z3950results where queryid=?"); ($stk->execute($id)) || (next); my %serverdone; + # if no results => set queue to done = -1, set startdate and begin creating z3950results table entries & z3950 queries unless ($stk->rows) { my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=? where id=?"); $sti->execute($now,$id); } + # check which servers calls have already been created (before a crash) while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) { ! if ($r_enddate >0) { # result entry exist & finished $serverdone{$r_server}=1; ! } elsif ($active) { # result entry exists & on the way (active=1) or already done (active=-1) $serverdone{$r_server}=1; ! } else { # otherwise $serverdone{$r_server}=-1; } + # note that is the entry doesn't exist, the $serverdone{$r_server} is 0 (important later !) } $stk->finish; ! foreach my $serverinfo (split(/\|/, $servers)) { ! (next) if ($serverdone{$serverinfo} == 1); #(otherwise, is 0 or -1) ! my $totalrecords=0; ! my $globalname; ! my $globalsyntax; ! my $globalencoding; ! # fork a process for this z3950 query if (my $pid=fork()) { $forkcounter++; } else { + # and connect to z3950 server + #FIXME: why do we need $dbi ? can't we use $dbh ? my $dbi = C4::Context->dbh; my ($name, $server, $database, $user, $password,$syntax) = split(/\//, $serverinfo, 6); *************** *** 110,172 **** my $servername=$1; my $port=$2; ! print "Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n"; ! $now=time(); ! my $q_serverinfo=$dbi->quote($serverinfo); ! my $resultsid; ! if ($serverdone{$serverinfo}==-1) { ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($q_serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! } else { ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($q_serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! unless ($resultsid) { ! $stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)"); ! $stj->execute($q_serverinfo, $id, $now); ! $resultsid=$dbi->{'mysql_insertid'}; ! $stj->finish; ! } } ! my $stj=$dbh->prepare("update z3950results set active=1 where id=?"); ! $stj->execute($resultsid); my $conn; my $noconnection=0; my $error=0; if ($user) { ! eval { $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database, user => $user, password => $password); }; ! if ($@) { ! $noconnection=1; ! } else { ! $error=pe(); ! } } else { ! eval { $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database); }; ! if ($@) { ! $noconnection=1; ! } else { ! $error=pe(); ! } } if ($noconnection || $error) { ! warn "no connection at $globalname "; } else { ! warn "$globalname ==> $globalsyntax"; eval {$conn->option(elementSetName => 'F')}; eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC"); eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC"); if ($@) { ! print "$globalname ERROR: $@\n"; } else { - # print "Q: $query\n"; my $rs=$conn->search($query); pe(); my $numresults=$rs->size(); if ($numresults eq 0) { ! warn "$globalname ==> answered : no records found"; } else { ! warn "$globalname ==> answered : $numresults found"; } pe(); --- 187,267 ---- my $servername=$1; my $port=$2; ! my $attr=''; ! if ($type eq 'isbn') { ! $attr='1=7'; ! } elsif ($type eq 'title') { ! $attr='1=4'; ! } elsif ($type eq 'author') { ! $attr='1=1003'; ! } elsif ($type eq 'lccn') { ! $attr='1=9'; ! } elsif ($type eq 'keyword') { ! $attr='1=1016'; } ! my $query="\@attr $attr \"$term\""; ! print "$$/$id : Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n"; ! # try to connect my $conn; my $noconnection=0; my $error=0; + # the z3950 query is builded. Launch it. if ($user) { ! $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database, user => $user, password => $password) || ($noconnection=1); } else { ! $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database) || ($noconnection=1); } if ($noconnection || $error) { ! # if connection impossible, don't go further ! ! print "$$/$id : no connection at $globalname\n"; ! my $result = MARC::Record->new(); ! my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($result,-1,"$globalname server is NOT responding","",$random); } else { ! # else, build z3950 query and do it ! ! $now=time(); ! my $resultsid=""; ! # create z3950results entries. ! if ($serverdone{$serverinfo}==-1) { # if entry exist, just retrieve it ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! print "$$/$id : 1 >> $resultsid\n"; ! } else { # else create it : (may be serverdone=1 or 0) ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! print "$$/$id : 2 >> $resultsid\n"; ! unless ($resultsid) { ! $stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)"); ! $stj->execute($serverinfo, $id, $now); ! $resultsid=$dbi->{'mysql_insertid'}; ! $stj->finish; ! print "$$/$id : creating and "; ! } ! } ! print "$$/$id : working on results entry $resultsid\n"; ! # set active to 1 => this request is on the way. ! my $stj=$dbi->prepare("update z3950results set active=1 where id=?"); ! $stj->execute($resultsid); ! ####### ! print "$$/$id : connected to $globalname\n"; eval {$conn->option(elementSetName => 'F')}; eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC"); eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC"); if ($@) { ! print "$$/$id : $globalname ERROR: $@ for $resultsid\n"; ! # in case pb during connexion, set result to "empty" to avoid everlasting loops ! my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results='',enddate=? where id=?"); ! $stj->execute(0,0,$now,$resultsid); } else { my $rs=$conn->search($query); pe(); + # we have an answer for a query => get results & store them in marc_breeding table my $numresults=$rs->size(); if ($numresults eq 0) { ! print "$$/$id : $globalname : no records found\n"; } else { ! print "$$/$id : $globalname : $numresults records found, retrieving them (max 80)\n"; } pe(); *************** *** 198,202 **** if ($elapsed) { my $speed=int($numresults/$elapsed*100)/100; ! print "$globalname SPEED: $speed $server done $numrecords\n"; } my $q_result=$dbi->quote($result); --- 293,297 ---- if ($elapsed) { my $speed=int($numresults/$elapsed*100)/100; ! print "$$/$id : $globalname : $server records retrieved $numrecords SPEED: $speed\n"; } my $q_result=$dbi->quote($result); *************** *** 210,274 **** $stj->execute($numresults,$numrecords,$now,$resultsid); } - my $counter=0; - while ($counter<60 && $numrecords<$numresults) { - $counter++; - my $stj=$dbi->prepare("select highestseen from z3950results where id=?"); - $stj->execute($resultsid); - my ($highestseen) = $stj->fetchrow; - if ($highestseen>($numrecords-30)) { - $counter=0; - print " $server rescanning\n"; - my $scantimerstart=time(); - for ($i=$numrecords+1; $i<=(($numresults<($numrecords+40)) ? ($numresults) : ($numrecords+40)); $i++) { - my $rec=$rs->record($i); - my $marcdata=$rec->rawdata(); - $result.=$marcdata; - } - my $scantimerend=time(); - ($numresults<$numrecords+40) ? ($numrecords=$numresults) : ($numrecords += 40); - my $elapsed=$scantimerend-$scantimerstart; - if ($elapsed) { - my $speed=int($numresults/$elapsed*100)/100; - print " SPEED: $speed $server done $numrecords\n"; - } - - my $q_result=$dbi->quote($result); - ($q_result) || ($q_result='""'); - $now=time(); - my $stj=$dbi->prepare("update z3950results set numdownloaded=?,results=? where id=?"); - $stj->execute($numrecords,$q_result,$resultsid); - } - sleep 5; - } } } ! # FIXME - There's already a $stj in this scope ! my $stj=$dbi->prepare("update z3950results set active=0 where id=?"); ! $stj->execute($resultsid); ! eval {$stj->finish}; ! print " $server done.\n"; exit; - sub pe { - return 0; - my $code=$conn->errcode(); - my $msg=$conn->errmsg(); - my $ai=$conn->addinfo(); - print << "EOF"; - CODE: $code - MSG: $msg - ADDTL: $ai - EOF - return 0; - } } } - unless ($stillprocessing) { - #my $sti=$dbh->prepare("select enddate from z3950queue where id=?"); - #$sti->execute($id); - #my ($enddate) = $sti->fetchrow; - #unless ($enddate) { - } } else { } } $lastrun=time(); --- 305,325 ---- $stj->execute($numresults,$numrecords,$now,$resultsid); } } + $stj=$dbi->prepare("update z3950results set active=-1 where id=?"); + $stj->execute($resultsid); + eval {my $stj->finish}; } ! #OK, the search is done inactivate it.. ! print "$$/$id : $server search done.\n"; exit; } } } else { + # $forkcounter >=12 } + # delete z3950queue entry, as everything is done + my $sti=$dbh->prepare("update z3950queue set done=1,enddate=? where id=?"); + $now=time(); + $sti->execute($now,$id); } $lastrun=time(); *************** *** 289,290 **** --- 340,344 ---- + sub pe { + return 0; + } Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/z3950/search.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** search.pl 23 Jun 2003 11:28:53 -0000 1.2 --- search.pl 11 Feb 2004 08:44:28 -0000 1.3 *************** *** 50,54 **** my $record; my $oldbiblio; - warn "search.pl : $bibid / $title / $author / $isbn"; if ($bibid > 0) { $record = MARCgetbiblio($dbh,$bibid); --- 50,53 ---- *************** *** 57,71 **** my $errmsg; unless ($random) { # if random is a parameter => we're just waiting for the search to end, it's a refresh. - warn "NO RANDOM"; if ($isbn) { - warn "ADD ISBN $isbn"; $random =rand(1000000000); $errmsg = addz3950queue($isbn, "isbn", $random, 'CHECKED'); } elsif ($author) { - warn "ADD AUTHOR $author"; $random =rand(1000000000); $errmsg = addz3950queue($author, "author", $random, 'CHECKED'); } elsif ($title) { - warn "ADD TITLE : $title"; $random =rand(1000000000); $errmsg = addz3950queue($title, "title", $random, 'CHECKED'); --- 56,66 ---- From tipaul at users.sourceforge.net Wed Feb 11 09:44:32 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:32 -0800 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.71,1.72 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/updater Modified Files: updatedatabase Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** updatedatabase 18 Dec 2003 17:23:22 -0000 1.71 --- updatedatabase 11 Feb 2004 08:44:29 -0000 1.72 *************** *** 857,860 **** --- 857,875 ---- $dbh->do('create fulltext index category_2 on bibliothesaurus (category,freelib)') unless $exists; + # + # creating index in z3950results if needed + # + $sth = $dbh->prepare("show index from z3950results"); + $sth->execute; + my $exists=0; + while ( my ( $table, $non_unique, $key_name, $Seq_in_index, $Column_name, $Collation, $cardinality, $sub_part, $Packed, $comment ) = $sth->fetchrow ) + { + if ($key_name eq 'query_server') { + $exists=1; + } + } + print "Creating index on z3950results\n" unless $exists; + $dbh->do('create unique index query_server on z3950results (queryid,server)') unless $exists; + # changing z3950daemon field to NULL in marc_breeding $dbh->do("ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"); *************** *** 982,986 **** # $Log$ ! # Revision 1.71 2003/12/18 17:23:22 tipaul # fix for 625 # --- 997,1007 ---- # $Log$ ! # Revision 1.72 2004/02/11 08:44:29 tipaul ! # synch'ing 2.0.0 branch (RC4 tag) and head ! # ! # Revision 1.70.2.2 2004/01/20 09:46:53 tipaul ! # new index in z3950results table ! # ! # Revision 1.70.2.1 2003/12/18 17:22:24 tipaul # fix for 625 # From tipaul at users.sourceforge.net Wed Feb 11 09:44:32 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:32 -0800 Subject: [Koha-cvs] CVS: koha/sec writeoff.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/sec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/sec Modified Files: writeoff.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: writeoff.pl =================================================================== RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** writeoff.pl 13 Oct 2002 10:46:38 -0000 1.6 --- writeoff.pl 11 Feb 2004 08:44:30 -0000 1.7 *************** *** 69,92 **** my $dbh = C4::Context->dbh; my $env; ! my $query="Update accountlines set amountoutstanding=0 where "; if ($accounttype eq 'Res'){ ! $query.="accounttype='Res' and accountno='$accountnum' and borrowernumber='$bornum'"; } else { ! $query.="accounttype='$accounttype' and itemnumber='$itemnum' and borrowernumber='$bornum'"; } - my $sth=$dbh->prepare($query); - # print $query; - $sth->execute; $sth->finish; ! $query="select max(accountno) from accountlines"; ! $sth=$dbh->prepare($query); $sth->execute; my $account=$sth->fetchrow_hashref; $sth->finish; $account->{'max(accountno)'}++; ! $query="insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype) ! values ('$bornum','$account->{'max(accountno)'}','$itemnum',now(),'$amount','Writeoff','W')"; ! $sth=$dbh->prepare($query); ! $sth->execute; $sth->finish; # print $query; --- 69,89 ---- my $dbh = C4::Context->dbh; my $env; ! my $sth; if ($accounttype eq 'Res'){ ! $sth=$dbh->prepare("Update accountlines set amountoutstanding=0 where accounttype='Res' and accountno=? and borrowernumber=?"); ! $sth->execute($accountnum,$bornum); } else { ! $sth=$dbh->prepare("Update accountlines set amountoutstanding=0 where accounttype=? and itemnumber=? and borrowernumber=?"); ! $sth->execute($accounttype,$itemnum,$bornum); } $sth->finish; ! $sth=$dbh->prepare("select max(accountno) from accountlines"); $sth->execute; my $account=$sth->fetchrow_hashref; $sth->finish; $account->{'max(accountno)'}++; ! $sth=$dbh->prepare("insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype) ! values (?,?,?,now(),?,'Writeoff','W')"); ! $sth->execute($bornum,$account->{'max(accountno)'},$itemnum,$amount); $sth->finish; # print $query; From tipaul at users.sourceforge.net Wed Feb 11 09:57:23 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:57:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.14,1.15 opac-main.tmpl,1.14,1.15 opac-searchresults.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26686/koha-tmpl/opac-tmpl/default/en Modified Files: opac-detail.tmpl opac-main.tmpl opac-searchresults.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** opac-detail.tmpl 7 Jan 2004 17:26:13 -0000 1.14 --- opac-detail.tmpl 11 Feb 2004 08:57:16 -0000 1.15 *************** *** 8,17 ****

    ! ! --- 8,17 ----

    !

    !

    ! (record )
    *************** *** 19,38 **** --- 19,41 ---- *************** *** 40,47 ****
    ! ( record )
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL: ">
    ! Total Number of Items:     		! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number of Items:
    ! - --- 43,49 ----
    Item TypeClass Location Date Due
    ! *************** *** 51,57 **** ! ! ! --- 53,58 ---- ! ! *************** *** 70,74 ****
    Item Type Location Date Due
    !


    --- 71,75 ---- !


    Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** opac-main.tmpl 7 Jan 2004 17:53:35 -0000 1.14 --- opac-main.tmpl 11 Feb 2004 08:57:17 -0000 1.15 *************** *** 3,7 **** ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** request.tmpl 9 Dec 2003 10:28:58 -0000 1.10 --- request.tmpl 11 Feb 2004 09:01:41 -0000 1.11 *************** *** 2,6 ****
    - /images/place-request.gif" align=right > "> --- 2,5 ---- *************** *** 37,50 **** ! Next Available,
    (or choose from list below) ! ! --- 36,49 ----
    /images/background-mem.gif">Request/images/background-mem.gif">Item Type /images/background-mem.gif">Classification /images/background-mem.gif">Volume ! Next Available, or choose from list below
    ! ! *************** *** 143,150 **** ! Next Available ! This type only : --- 142,149 ---- ! Next Available ! This type only : *************** *** 156,161 ****
    /images/background-mem.gif">Request/images/background-mem.gif">Item type /images/background-mem.gif">Classification /images/background-mem.gif">Volume
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png">
    --- 155,161 ---- ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> ! Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** shelves.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- shelves.tmpl 11 Feb 2004 09:01:41 -0000 1.3 *************** *** 1,41 **** -

    Logged in as: [Log Out]

    - - !
    ! ! Shelf List

    ! ! - - - !
    ! ! !
    Add a book by barcode:
    !
    ! ! !
    "> ! Contents of shelf !
    !
    ">">" width=10 align=center> ">" width=10 align=center> ">" width=10 align=center> ">
    !
    ! "> ! ! "> ! !

    --- 1,47 ---- !
    !
    ! ! ! ! !
    "> ! Contents of !
    ">"> "> "> ">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Add a book by barcode in : ! ! ! ! "> ! !
    !
    *************** *** 49,102 ****
    - Modify Shelf Contents

    Bookshelves

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Add Shelf:

    !

    ! !

    ! !
    "> ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    Add or Remove Book Shelves - ! ! \ No newline at end of file --- 55,139 ----

    Bookshelves

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Add Shelf !
    !

    !
    !

    !
    !
    ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    ! Add or Remove Book Shelves !

    ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** thesaurus_popup.tmpl 9 Dec 2003 10:28:58 -0000 1.4 --- thesaurus_popup.tmpl 11 Feb 2004 09:01:41 -0000 1.5 *************** *** 10,13 **** --- 10,14 ---- "> "> + "> "> *************** *** 19,22 **** --- 20,24 ---- "> + "> "> *************** *** 28,31 **** --- 30,34 ---- "> "> + "> insert a new authority : From tipaul at users.sourceforge.net Wed Feb 11 10:03:48 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** circulation.tmpl 9 Dec 2003 10:29:05 -0000 1.15 --- circulation.tmpl 11 Feb 2004 09:03:46 -0000 1.16 *************** *** 5,9 **** ! &branch=&printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &printer=&print=yes"> Next Borrower  *************** *** 14,24 **** !

    Circulation: Issues


    ! Branch:
    ! Printer:
    !     Change Settings "> "> -

     

    --- 14,21 ----
    !

    Circulation: Issues

    ! Branch: Printer: Change Settings "> "> *************** *** 38,42 **** Branch:
    Printer:
    ! Change Settings"> "> --- 35,39 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 141,145 ****
    ! --- 138,142 ----
    ! *************** *** 172,176 **** + + +
    ! --- 17,39 ----
    --- 169,173 ---- ! ! --- 184,188 ---- ! *************** *** 225,230 **** + *************** *** 257,263 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** moredetail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- moredetail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 *************** *** 31,38 **** Biblionumber:
    ! Item Type:
    URL:
    ! Loan Length:
    ! Rental Charge:
    Classification:
    ISBN:
    --- 31,38 ---- Biblionumber:
    ! Item type:
    URL:
    ! Loan length:
    ! Rental charge:
    Classification:
    ISBN:
    Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** searchresults.tmpl 9 Dec 2003 10:29:06 -0000 1.7 --- searchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.8 *************** *** 85,89 ****
    ! Results through of records.
    --- 85,89 ----
    ! Results through of records.
    Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** subject.tmpl 9 Dec 2003 10:29:06 -0000 1.4 --- subject.tmpl 11 Feb 2004 09:03:46 -0000 1.5 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 ****
    *************** *** 187,191 **** Item Barcode:
    Item Barcode:
    ! !
    Patron information
    " onClick="openWindow(this,'Member', 480, 640)"> --- 222,227 ---- ! ! + + + + + + + + + *************** *** 254,258 **** ! --- 260,264 ---- ! *************** *** 264,270 ****
    Borrower information
    " onClick="openWindow(this,'Member', 480, 640)"> *************** *** 233,236 **** --- 230,242 ----
    GNA>Borrower is gone with no address
    LOST>Borrower's card is lost
    DBARRED>Borrower is debarred
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    ODUESYes, See below
    ODUESYes, See below
    !



    !
    /images/background-mem.gif"> --- 270,276 ----
    !
    ! ! --- 24,31 ---- ! *************** *** 64,68 **** --- 91,101 ---- Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cmsdsearchresults.tmpl 9 Dec 2003 10:29:05 -0000 1.2 --- cmsdsearchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.3 *************** *** 24,28 ****
    /images/background-mem.gif"> From tipaul at users.sourceforge.net Wed Feb 11 10:03:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detailprint.tmpl,1.1,1.2 catalogue-home.tmpl,1.8,1.9 cmsdsearchresults.tmpl,1.2,1.3 detail-opac.tmpl,1.5,1.6 detail.tmpl,1.9,1.10 MARCdetail.tmpl,1.14,1.15 moredetail.tmpl,1.9,1.10 searchresults.tmpl,1.7,1.8 subject.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Added Files: detailprint.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** catalogue-home.tmpl 9 Dec 2003 10:29:05 -0000 1.8 --- catalogue-home.tmpl 11 Feb 2004 09:03:46 -0000 1.9 *************** *** 24,31 ****
    HELP
    ! Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

    HELP
    ! Search :Using more fields for your search will slow it down.

    		 --- 64,68 ---- *************** *** 91,101 **** ! //images/2rightarrow.png" BORDER=0 > ! ! Virtual Bookshelves
    ! ! ! Virtual Bookshelves

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** detail-opac.tmpl 9 Dec 2003 10:29:06 -0000 1.5 --- detail-opac.tmpl 11 Feb 2004 09:03:46 -0000 1.6 *************** *** 38,46 **** ! ! --- 38,46 ----
    Item Type Class Location Date DueLast Seen
    ! ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** detail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- detail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 *************** *** 25,45 ****
    " class="button">MARC

    ! Subtitle: ! Author: >
    ! Additional Author:
    ! Published by : ! in , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL:
    ! total number of Items: !

    --- 25,47 ----
    " class="button">MARC

    ! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number of Items:     *************** *** 58,67 ****

    Item type Class Location Date DueLast seen
    ! ! ! ! ! ! --- 60,68 ----
    Item TypeClassLocationDate DueLast SeenBarcode Volume
    ! ! ! ! ! *************** *** 69,77 **** ! ! ! --- 70,77 ---- ! ! *************** *** 96,115 ****
    Item typeLocationDate DueLast seenBarcode Volume
    > &item=&bib=&bi=">
    &item=&bib=&bi=">

    - - - - -
    -

    HELP
    - Update Biblio for all Items: Click on the Modify - button [left] to amend the biblio. Any changes you make will update - the record for all the items listed above.

    - Updating the Biblio for only ONE or SOME Items: - If some of the items listed above need a different biblio, or are on the - wrong biblio, you must use the - acquisitions - process to fix this. You will need to "re-order" the items, and delete them - from this biblio.

    -


    --- 96,99 ---- Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** MARCdetail.tmpl 9 Dec 2003 10:29:06 -0000 1.14 --- MARCdetail.tmpl 11 Feb 2004 09:03:46 -0000 1.15 *************** *** 19,22 **** --- 19,23 ----

    		//images/edittrash.png"> ">Normal')">Print MARC biblio :
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Subject
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !
    !

    ! Results through of records.
    --- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subject
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Results through of records.
    From tipaul at users.sourceforge.net Wed Feb 11 10:03:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.24,1.25 addbooks.tmpl,1.12,1.13 additem.tmpl,1.14,1.15 isbnsearch.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: addbiblio.tmpl addbooks.tmpl additem.tmpl isbnsearch.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** addbiblio.tmpl 9 Dec 2003 10:29:06 -0000 1.24 --- addbiblio.tmpl 11 Feb 2004 09:03:47 -0000 1.25 *************** *** 1,3 **** ! "> ! ! z3950 search
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! ! ! ! ! z3950 search
    +   + + +
    >>>>
    +     +
    *************** *** 85,88 **** --- 100,115 ---- +
    + +
    <<<<
    +     +     		+ +
    >>>>
    +     +
    *************** *** 110,113 **** --- 137,152 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 135,138 **** --- 174,189 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 160,163 **** --- 211,226 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 185,188 **** --- 248,263 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 210,213 **** --- 285,300 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 235,238 **** --- 322,337 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 260,263 **** --- 359,374 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 285,288 **** --- 396,404 ---- + + +
    <<<<
    +     + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** addbooks.tmpl 9 Dec 2003 10:29:06 -0000 1.12 --- addbooks.tmpl 11 Feb 2004 09:03:47 -0000 1.13 *************** *** 22,26 **** ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    --- 22,26 ---- ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    *************** *** 32,38 ****   ! Create Empty biblio ! Create Empty biblio --- 32,38 ----   ! Create Empty biblio ! Create Empty biblio *************** *** 52,56 **** Keyword: ! --- 52,56 ---- Keyword: ! Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** additem.tmpl 18 Dec 2003 17:19:56 -0000 1.14 --- additem.tmpl 11 Feb 2004 09:03:47 -0000 1.15 *************** *** 1,3 **** ! ! ! ! ! !
    ! ! !
    ! ! ! ! ! ! ! !
    ! ! Koha
    ! SIGB sous licence libre

     ! Koha : un don, une contribution
    en langue Maori         		!         ! Chercher dans le catalogue ! ! !
    ! Saisissez et validez avec Entrée
    ! - Recherche avancée --- 1,91 ---- ! ! ! ! Bienvenue dans l'OPAC de Koha + + ! ! !
    /images/front-background-med.gif"> ! /images/holder.gif" alt="" width="1" height="440" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! --- 93,124 ---- ! ! ! *************** *** 105,107 ****
    /images/holder.gif" alt="" width="260" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="30" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="350" height="88" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" alt="" width="1" height="30" hspace="0" vspace="0" border="0"> ! !        /images/front-arrow.gif" alt="" border="0" width="27" height="22"> ! Chercher dans le catalogue ! ! !
    ! Saisissez et validez avec Entrée.
    ! /images/front-arrow-small.gif" alt="-" width="20" height="16" hspace="0" vspace="0" border="0" align="middle"> Recherche avancée *************** *** 71,102 ****
      !         ! Acquisitions récentes !
    ! acquis
    ! dans les derniers jours !
      ! ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier

    !
      !        /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! Acquisitions récentes !
    ! acquis
    ! dans les derniers jours     !
      ! /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier

    !
    ! --- 127,130 ----
    ! ! Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-moredetail.tmpl 8 Dec 2003 16:27:45 -0000 1.4 --- opac-moredetail.tmpl 11 Feb 2004 08:46:27 -0000 1.5 *************** *** 1,28 **** !
    - -

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    - -

    S'identifier à Koha

    -     -
    ! ! &type=intra> ! ()

    ! > ! > --- 1,22 ---- !

    ! ! &type=intra> ! ()

    ! > ! >

    GROUPE
    *************** *** 34,53 ****
    ! Numéro notice ::
    ! Type d'ouvrage ::
    ! URL:
    ! Durée prêt:
    ! Coût du prêt:
    ! Classification:
    ! ISBN:
    ! Editions:
    ! Placer:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Taille:
    ! Notes:
    ! N° ouvrage:     --- 28,47 ----
    ! Numéro notice ::
    ! Type d'ouvrage:
    ! URL:
    ! Durée prêt:
    ! Coût du prêt:
    ! Classification:
    ! ISBN:
    ! Editions:
    ! Placer:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Taille:
    ! Notes:
    ! N° ouvrage:     *************** *** 55,72 ****
    GROUPE
    !     !
    CODE BARRE !
    ! > ! > ! > --- 49,66 ----
    ! !
    CODE BARRE !
    ! > ! > ! > *************** *** 75,99 ****
    ! Annexe propriétaire:
    ! Vu:
    ! Dernier prêt:
    ! on issue bit ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Coût de remplacement:
    ! Ouvrage perdu:
    ! Payé pour ::
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Annul?:
    &bi=&itm=>Total ! Issues:
    ! Groupe numéro:
    ! Notice biblio ::
    --- 69,93 ----
    ! Annexe propriétaire:
    ! Vu:
    ! Dernier prêt:
    ! En prêt \? ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Coût de remplacement:
    ! Ouvrage perdu:
    ! Payé pour ::
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Annul\?:
    &bi=&itm=>Total ! Issues:
    ! Groupe numéro:
    ! Notice biblio ::
    *************** *** 104,108 ****
    !

    --- 98,102 ----

    !

    *************** *** 110,112 **** ! --- 104,106 ---- ! Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-reserve.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-reserve.tmpl 8 Dec 2003 16:27:45 -0000 1.6 --- opac-reserve.tmpl 11 Feb 2004 08:46:27 -0000 1.7 *************** *** 1,65 **** ! !

    ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier à Koha

    !     ! ! ! !
    ! Sorry, you cannot make reserves because you owe .
    ! Impossible de faire plus de Réservations
    ! Vous avez déjà placé une réservation sur cet exemplaire
    ! Vous devez sélectionner au moins 1 type d'exemplaire
    ! Sélectionnez une annexe ou retirer l'ouvrage
    !

    !     ! !

    Réservation de l'ouvrage :: ( )

    !

    Il y a Réservations déjà faites sur cet ouvrage

    !

    Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous.

    !

    ! "> ! ! ! ! ! ! ! ! ! ! !
    ReserverType d'ouvrage : Copies
    Non réservable

    Sélectionnez l'annexe ou vous prendrez l'ouvrage: !
    !

    ! --- 1,62 ---- ! !
    ! !
    Réserver à cette date :: ! ! !
    !
    ! Désolé, vous ne pouvez pas faire de réservation parce que vous devez .
    ! Sorry, you cannot make more than reserves.
    ! Vous avez déjà placé une réservation sur cet exemplaire.
    ! Vous devez sélectionner au moins 1 type d'exemplaire
    ! Sélectionnez une annexe ou retirer l'ouvrage
    !
    ! ! !

    Réservation de l'ouvrage :: ( )

    !

    Il y a Réservations déjà faites sur cet ouvrage.

    !

    Sélectionnez les types d'ouvrages souhaités. Le premier disponible sera gardé pour vous..

    ! ! "> ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! !
    ReserverType d'ouvrage Copies
    "> Non réservable

    Sélectionnez l'annexe ou vous prendrez l'ouvrage: ! !

    ! *************** *** 67,112 ****
    Réserver à cette date :: ! ! !
    Annuler réservation à cette date: ! ! !
    !

    ! !

    !     ! !

    Confirmez que vous souhaitez réserver un ouvrage ::

    !

    ! ! ! ! ! ! ! ! !
    Type d'ouvrage :
    ! Qui sera retiré à .
    ! ! !
    Il y aura des frais de réservation de $
    !     ! !
    !     --- 64,113 ----
    		Annuler réservation à cette date: ! ! !
    !

    ! ! ! !

    Confirmez que vous souhaitez réserver un ouvrage ::

    !
    ! ! "> ! "> ! ! ! ! !
    /images/background-opac.gif">Type d'ouvrage
    ">
    ! Qui sera retiré à .
    ! "> ! !

    Il y aura des frais de réservation de $

    ! ! !
    ! ! ! + \ No newline at end of file Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-searchresults.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-searchresults.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-searchresults.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,66 **** ! -
    - -

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    - -

    S'identifier à Koha

    -     - - - - Recherche effectuée sur - - - acquis dans les derniers jours
    - - Vous n'avez pas spécifié de critère
    -     -     ! Réponses trouvées !

    - - - &=>/images/numbers/prev.gif border=0> - - /images/numbers/placeholder.gif border=0> - - - - /images/numbers/-highlight.gif> - - &=>/images/numbers/.gif border=0> - - - - &=>/images/numbers/next.gif border=0> - - /images/numbers/placeholder.gif border=0> - !

    ! ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif> ! --- 1,58 ---- ! !
    ! Recherche effectuée sur ! ! ! acquis dans les derniers jours
    ! ! Vous n'avez pas spécifié de critère
    ! ! + Réponses trouvées
    +
    !
    ! ! &=">/images/numbers/prev.gif" border="0" alt="Previous Page" height="14" width="15"> ! ! /images/numbers/placeholder.gif" height="14" width="15" alt="" border="0"> ! ! ! ! /images/numbers/-highlight.gif" alt="" height="14" width="15" border="0"> ! ! &=">/images/numbers/.gif" border="0" alt="" height="14" width="15"> ! ! ! ! &=">/images/numbers/next.gif" border="0" height="14" width="15" alt="Next Page"> ! ! /images/numbers/placeholder.gif" border="0" width="14" height="14" alt=""> !
    !
    ! ! !
    Sujet
    >
     
    ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif"> ! *************** *** 69,79 **** ! !
    Sujet
    ">
     
    ! /images/background-opac.gif> ! ! --- 61,71 ---- ! !
    TitreAuteur © Nombre d'ouvrages
    ! /images/background-opac.gif"> ! ! *************** *** 84,122 **** ! ! ! ! ! ! ! ! ! /images/background-opac.gif> ! ! ! ! ! ! ! ! ! ! ! ! ! --- 15,38 ---- ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 42,47 ****
    !

     

    ! --- 40,47 ----
    !

     

    ! ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** charges.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- charges.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,33 **** ! ! ! ! !

    Chaque champ doit être rempli avec le montant de l'amende, le délai ! et le cycle
    ! (par ex. 1,7,7 = € 1.- d'amende, après 7 jours, tous les 7 jours). !

    ! !

    TitreAuteur © Nombre d'ouvrages
    bgcolor='#ffffcc'>>bgcolor='#ffffcc'>>bgcolor='#ffffcc' align=center> bgcolor='#ffffcc' align=center> bgcolor='#ffffcc'> bgcolor='#ffffcc'> ! ! >Reserver ! Non réservable !
    ! ! /images/background-opac.gif> ! ! --- 76,114 ---- ! ! ! ! ! ! ! ! ! /images/background-opac.gif"> !
    ! ! &=>Précédents !   ! ! ! &=>Enregistrement suivant !   !
    bgcolor="#ffffcc">">bgcolor="#ffffcc">">bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> ! ! ">Reserver ! Non réservable !
    ! ! /images/background-opac.gif"> ! ! *************** *** 125,139 ****
    ! ! &=">Previous Records !   ! ! ! &=">Next Records !   !
    ! !
    ! Résultats à de réponses
    ! ! Désolé, aucun résultat !
    ! - Try another search - --- 117,132 ----
    ! !
    !
    Résultats à de réponses.
    ! !
    Désolé, aucun résultat !
    ! ! !
    Essayez une autre recherche
    ! Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-search.tmpl 8 Dec 2003 16:27:45 -0000 1.8 --- opac-search.tmpl 11 Feb 2004 08:46:27 -0000 1.9 *************** *** 1,88 **** ! ! !

    Connecté en tant que: [Accueil lecteur][Déconnecter]

    ! !

    S'identifier à Koha

    !     ! ! !
    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! ! ! ! !
    Mot-clefs
    OU :
    Sujet
    OU un ou plus de : :
    TitreNormalExact
    Auteur
    Illustrateur
    Classe
    Code barre
    Notez que le mot clef est prioritaire
    !
    !
    ! --- 1,71 ---- ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + ! ! ! ! !
    Mot-clefs
    OU :
    Sujet
    OU un ou plus de : :
    TitreNormalExact
    Auteur
    Illustrateur
    Classe
    Code barre
    Notez que le mot clef est prioritaire
    !
    ! Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-user.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-user.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-user.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,19 **** ! ! ! ! ! ! --- 1,20 ---- ! ! !
    Est-ce correct?
    Carte lecteur:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !

    quelque chose à modifier ??

    Mettre à jour
    ! ! ! *************** *** 21,135 **** ! ! Bonjour, ! [Déconnecter]

    ! ! ! !

    Est-ce correct
    Carte lecteur:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !
    quelque chose à modifier \?

    Mettre à jour +
    ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez des dettes de
    !     ! !
    ! ! Vous avez un crédit de
    !     ! Voir compte !     ! ! ! ! ! !
    ! ! Vous avez des réservations en attente: -

    ! Prendre à ::
    !     -

    - ! Vous avez Ouvrage en prêt actuellement
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate retourType d'ouvrageChargesPrêt
    OuiNonOuiNon
    ! !

    Vous n'avez pas d'exemplaire en prêt

    ! ! !

    ! ! ! Vous avez Ouvrages réservés actuellement
    ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate réservation
    !     ! --- 22,135 ---- ! !
    ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez un crédit de
    ! !

    Voir compte

    ! ! ! ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! !
    ! ! Vous avez des réservations en attente:
    TitreAuteurDate réservationAnnexe de retrait
    ! "> 

     

    ! ! ! !

    You have Ouvrage en prêt actuellement.

    ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate retourType d'ouvrageChargesPrêt
    "> YesNoYesNo
    ! !

    Vous n'avez pas d'exemplaire en prêt.

    ! ! ! ! !

    You have Ouvrages réservés actuellement.

    ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate réservation
    "> 
    ! ! Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-userupdate.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-userupdate.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-userupdate.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,56 **** ! ! !

    Connecté en tant que: [Déconnecter]

    ! !

    S'identifier à Koha

    !     ! Changer le nécessaire
    ! Your changes won't appear until the library has validated them.

    ! !
    !
    ! ! ! ! ! ! ! ! ! - - ! ! ! ! - - ! ! ! !
    Nom
    Titre
    Prénom
    Adresse postale
    Ville
    Téléphone maison
    Tel bureau
    Mail
    !
    !
    !
    !     ! ! --- 1,47 ---- ! !

    Changer le nécessaire.
    ! Vos changement n'apparaitront que lorsque la bibliothèque les aura validé.

    ! !
    ! ! ! ! ! ! ! ! ! ! ! + + ! ! ! ! + + + !
    Nom " name="surname">
    Titre " name="title">
    Prénom " name="firstname">
    Adresse postale " name="streetaddress">
    Ville " name="city">
    Téléphone maison " name="phone">
    Tel bureau " name="faxnumber">
    Mail " name="emailaddress">
    !
    ! ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** subject.tmpl 8 Dec 2003 16:27:45 -0000 1.4 --- subject.tmpl 11 Feb 2004 08:46:27 -0000 1.5 *************** *** 1,44 **** ! ! ! !

    Connecté en tant que: [Déconnecter]

    ! !

    S'identifier à Koha

    !     ! !
    ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Sujet
    >
     

    ! Results à de réponses
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Sujet
    ">
     

    ! Résultats à de réponses.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From tipaul at users.sourceforge.net Wed Feb 11 09:59:14 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:59:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.1,1.2 auth.tmpl,1.1,1.2 member-flags.tmpl,1.1,1.2 moditem.tmpl,1.1,1.2 modwebsites.tmpl,1.1,1.2 newjmember.tmpl,1.1,1.2 reports.tmpl,1.1,1.2 reservereport.tmpl,1.1,1.2 shelves.tmpl,1.1,1.2 stats.tmpl,1.1,1.2 updatebiblio.tmpl,1.1,1.2 bookcount.tmpl,1.1,1.2 boraccount.tmpl,1.4,1.5 charges.tmpl,1.1,1.2 default.tmpl,1.1,1.2 intranet-main.tmpl,1.6,1.7 mancredit.tmpl,1.1,1.2 maninvoice.tmpl,1.1,1.2 modbibitem.tmpl,1.1,1.2 modbib.tmpl,1.2,1.3 newimember.tmpl,1.2,1.3 newmember.tmpl,1.3,1.4 opac-main.tmpl,1.1,1.2 overdue.tmpl,1.1,1.2 request.tmpl,1.5,1.6 searchheader.tmpl,1.1,1.2 thesaurus_popup.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26987/koha-tmpl/intranet-tmpl/default/fr Modified Files: bookcount.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl modbibitem.tmpl modbib.tmpl newimember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl request.tmpl searchheader.tmpl thesaurus_popup.tmpl Added Files: about.tmpl auth.tmpl member-flags.tmpl moditem.tmpl modwebsites.tmpl newjmember.tmpl reports.tmpl reservereport.tmpl shelves.tmpl stats.tmpl updatebiblio.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: bookcount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** bookcount.tmpl 3 Feb 2003 10:54:59 -0000 1.1 --- bookcount.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,46 **** ! !
    !
    ! ! &type="intra"> () ! !

    ! ! ! ! ! ! ! ! ! ! !
    CODE BARRES !
    ! ! Site d'origine :
    ! Site actuel :
    ! Date d'arrivée sur le site actuel : !
    ! Nombre de sortie depuis cette date :
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Site Nombre de sorties Dernière apparition sur le site
    !
    ! !

    \ No newline at end of file --- 1,40 ---- ! !
    !
    !

    ! &type="intra"> ()

    !

    ! ! ! ! ! ! ! ! !
    ! CODE BARRE !
    ! ! Annexe propriétaire:
    ! Annexe:
    ! Date d'arrivée à l'Annexe:
    ! Nombre de prêt depuis la date ci-dessus:
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Annexe Nombre de prêts Vu à l'Annexe
    !
    ! ! Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** boraccount.tmpl 18 Sep 2003 10:19:29 -0000 1.4 --- boraccount.tmpl 11 Feb 2004 08:58:38 -0000 1.5 *************** *** 1,10 **** ! ! Compte de ! !

    ! Ajouter une dette   ! Encaisser

    --- 1,10 ---- ! ! ! !

    Compte pour ">

    ! Créer une facture manuelle   ! Créer un crédit manuel

    *************** *** 15,40 ****

    /images/background-mem.gif" colspan=2>AMENDES ! & FRAIS/images/background-mem.gif" colspan=1>MONTANT/images/background-mem.gif" colspan=1>SOLDE !
    Total dû
    /images/background-mem.gif" colspan=2>AMENDES & FRAIS/images/background-mem.gif" colspan=1>MONTANT/images/background-mem.gif" colspan=1>DOIT ENCORE
    Total dû
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! \ No newline at end of file --- 1,32 ---- ! ! ! ! !

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours.

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! \ No newline at end of file Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/default.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** default.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- default.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,35 **** !

    ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurNbre de doc.Localisation
    >
    ! ! ! !
    &startfrom=>Résultats ! précédants &startfrom=>Résultats ! suivants

    ! Résultats à ! sur enregistrements. !
    ! !
    --- 1,28 ---- !
    ! ! ! ! ! ! !
    TitreAuteurNombre d'ouvragesBiblionumber
    >
    !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !

    ! Résultats à sur enregistrements. !
    ! Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** intranet-main.tmpl 4 Apr 2003 08:40:08 -0000 1.6 --- intranet-main.tmpl 11 Feb 2004 08:58:38 -0000 1.7 *************** *** 1,188 **** ! ! Bienvenue sur l'Intranet Koha ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,158 ---- ! ! ! ! Bienvenue dans l'intranet de Koha ! ! ! ! ! ! !
    Catalogue
    !
    ! Koha: Horowhenua Library Trust    		 ! ! !
    ! Après la saisie, ! pressez la touche Entrée.
    ! ! Recherche avancée (Plus d'options)
    ! !
    ! ! Lecteurs !
    ! ! !
    ! Après la saisie, ! pressez la touche Entrée.
    !
    Acquisitions
    !
    Etats
    !
    Paramètres
    !
    Circulation
    ! ! ! --- 7,11 ---- ! *************** *** 13,19 **** --- 13,19 ---- *************** *** 21,60 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + + + + ! ! *************** *** 191,195 ****
    /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
    /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Recherche Catalogue" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
    ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">    		   ! !
    !
    ! ! Saisissez une valeur et pressez la touche Entrée..
    ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Recherche avancée (plus d'options)
    !
    ! ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
      ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Recherche Lecteur" name="member" hspace="0" vspace="0" border="0"> !
      
    ! !
    ! Saisissez une valeur et pressez la touche Entrée..
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
         /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Acquisitions" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
         /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Accounts et Reports" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Paramètres" border="0">
    + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
      /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Circulation" hspace="0" vspace="0" border="0">
    - --- 161,164 ---- Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** mancredit.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- mancredit.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,32 **** ! ! !
    !

    Crédit manuel

    !
    !
    ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Numéro de lecteur
    Type de crédit ! !
    Numéro de document
    Description
    Montant
    !
    ! ! \ No newline at end of file --- 1,22 ---- ! ! !

    Crédit manuel

    !
    ! ! "> ! ! ! ! ! ! !
    N° Lecteur
    Saisir ! !
    Itemnumber
    Description
    Montant
    !
    ! ! \ No newline at end of file Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** maninvoice.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- maninvoice.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,37 **** ! ! !
    !

    Facture manuelle

    !
    !
    ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Numéro de lecteur
    Type de facture ! !
    Numéro de document
    Description
    Montant
    ! !
    !
    ! ! --- 1,25 ---- ! ! !

    Facture manuelle

    !
    ! ! "> ! ! ! ! ! ! !
    N° Lecteur
    Saisir ! !
    Itemnumber
    Description
    Montant
    !
    ! ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modbibitem.tmpl 7 Aug 2003 14:41:23 -0000 1.1 --- modbibitem.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,5 **** ! !

    "&type=intra> ()
    ! Modifier Groupe -


    --- 1,5 ---- ! !

    "&type=intra> ()
    ! Modifier groupe


    *************** *** 7,11 ****
    Assigner à un groupe existant
    RE-ASSIGNE AU GROUPE EXISTANT
    OR MODIFY DETAILS
    Item Type" size=20>
    URL" size="20">
    Class" size=20>
    Publisher" size=20>
    Place" size=20>
    ISBN" size=20>
    Publication Year" size=20>
    Pages" size=20>
    Illustrations" size=20>
    Volume" size=20>
    Notes">
    Size" size=20>
    --- 21,60 ----
    ou modifie les détails
    Catég ouvrage" size=20>
    URL" size="20">
    Catégorie" size=20>
    Editeur" size=20>
    Lieu" size=20>
    ISBN" size=20>
    Année de publication" size=20>
    Pages" size=20>
    Illustations" size=20>
    Volume" size=20>
    Notes">
    Taille" size=20>
    *************** *** 68,96 **** ! CHANGES TO AFFECT THESE BARCODES
    ! Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.   ! Barcode ! Location ! Date Due ! Last Seen ! ! "> ! "&bib=""&bi="""> ! ! !

    ! --- 68,96 ---- ! MODIFS SUR CES CODES-BARRES
    ! Sélectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-sélectionnés ne seront pas affectés.   ! Code barre ! Localisation ! Date de retour ! Vu ! ! "> ! "&bib=""&bi="""> ! ! !

    ! *************** *** 99,106 **** ! HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some ! items, tick the appropriate ones and a new group record will be created automatically for them.

     

    ! --- 99,106 ---- ! AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some ! items, tick the appropriate ones et a new group record will be created automatically for them.

     

    ! Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** modbib.tmpl 6 Jun 2003 09:31:52 -0000 1.2 --- modbib.tmpl 11 Feb 2004 08:58:38 -0000 1.3 *************** *** 1,63 **** ! ! ">Modifier Liens web ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Auteur">
    Titre">
    Résumé
    Sujet
    Copyright">
    Titre périodique">
    Autres auteurs">
    Sous titre">
    Titre uniforme">
    Notes
    Périodique">

    ! ! --- 1,63 ---- ! ! ">Modifier Site Web Links
    ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Auteur">
    Titre">
    Résumé
    Sujet
    Date Copyright">
    Titre Séries">
    Auteur supplémentaire">
    Sous-titre">
    Titre uniforme">
    Notes
    Périodiques">

    !
    ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** newimember.tmpl 6 Jun 2003 10:00:52 -0000 1.2 --- newimember.tmpl 11 Feb 2004 08:58:38 -0000 1.3 *************** *** 1,22 **** ! ! ! Les champs obligatoires ! suivants n'ont pas été saisis. Veuillez retourner à la page ! précédantes et compléter les champs. ! ! ! ! Numéro de carte erroné. ! ! Valeurs correctes. Cliquer sur OK pour valider.
    ! ! " value=""> !
    !     !     ! --- 1,180 ---- ! ! ! ! ! ! N° carte invalide.

    ! !

    Confirmer Enregistrement

    ! ! " > ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! !
    /images/background-mem.gif"> ! NOUVEAU LECTEUR !
    ! Nom ! ! !
    /images/background-mem.gif"> ! DETAILS LECTEUR !
    ! N° Lecteur ! ! !
    ! N° Carte ! ! !
    ! Annexe d'inscription ! ! !
    /images/background-mem.gif"> ! ADRESSE LECTEUR !
    ! Adresse postale ! ! !
    ! Adresse privée ! ! !
    /images/background-mem.gif"> ! DETAILS LECTEUR !
    ! Téléphone (Accueil) ! ! !
    ! Téléphone (Daytime) ! ! !
    ! Fax ! ! !
    ! E-mail ! ! !
    ! Ecriture d'un texte ! ! !
    /images/background-mem.gif"> ! DETAIL AUTRE CONTACT !
    ! Nom ! ! !
    ! Téléphone ! ! !
    ! Relation ! ! !
    ! Notes ! ! !
    /images/background-mem.gif"> ! NOTES !
    ! Notes générales ! ! !

    ! Valeurs valides. Cliquez sur OK pour confirmer ce nouveau lecteur

    ! ! " value=""> !
    ! ! ! Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/newmember.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** newmember.tmpl 6 Nov 2003 10:18:34 -0000 1.3 --- newmember.tmpl 11 Feb 2004 08:58:38 -0000 1.4 *************** *** 1,10 **** ! ! !

    Confirmer l'enregistrement

    ! " > ! --- 1,10 ---- ! ! !

    Confirmer Enregistrement

    /images/background-mem.gif"> ! NOUVEAU LECTEUR
    ! " > ! *************** *** 14,47 **** ! " > ! --- 14,47 ---- ! " > ! *************** *** 51,55 **** --- 51,55 ---- *************** *** 59,83 **** ! " > ! --- 59,83 ---- ! " > ! *************** *** 88,92 **** --- 88,92 ---- *************** *** 96,105 **** ! " > ! --- 96,109 ---- ! " > ! *************** *** 109,142 **** ! " > ! --- 113,146 ---- ! " > ! *************** *** 146,150 **** --- 150,154 ---- *************** *** 154,171 **** ! " > ! --- 158,175 ---- ! " > ! *************** *** 175,187 **** --- 179,191 ---- *************** *** 191,195 **** --- 195,199 ---- *************** *** 199,207 **** ! " > ! --- 203,211 ---- ! " > ! *************** *** 209,251 ****
    /images/background-mem.gif"> ! NOUVEAU LECTEUR
    !
    /images/background-mem.gif"> ! Détails
    ! Numéro interne !
    ! Numéro de carte !
    ! Catégorie de lecteur !
    !
    /images/background-mem.gif"> ! DETAILS LECTEUR
    ! N° Lecteur !
    ! N° Carte !
    ! Catégorie Lecteur !
    !
    !
    !
    ! Date expiration !
    ! Annexe de rattachement !
    /images/background-mem.gif"> DETAILS PERSONNELS !
    ! Date d'expiration !
    ! Annexe d'inscription !
    /images/background-mem.gif"> DETAILS PERSONNELS !
    !
    !
    /images/background-mem.gif"> ! ADRESSE
    ! ! Male ! ! Female !
    /images/background-mem.gif"> ! ADRESSE LECTEUR
    !
    ! Adresse !
    /images/background-mem.gif"> ! CONTACTS
    ! Téléphone (maison) !
    ! Téléphone (bureau) !
    !
    ! Adresse privée !
    /images/background-mem.gif"> ! DETAILS LECTEUR
    ! Téléphone personnel !
    ! Téléphone professionnel !
    !
    !
    !
    ! Texte !
    /images/background-mem.gif"> ! AUTRES CONTACTS
    !
    ! Ecriture d'un texte !
    /images/background-mem.gif"> ! DETAIL AUTRE CONTACT
    !
    ! Téléphone !
    !
    ! Téléphone !
    !
    !
    !
    /images/background-mem.gif"> NOTES !
    /images/background-mem.gif"> NOTES
    ! Notes générales !

    ! ! " value=""> !
    !

    ERREUR

    !

    Les champs suivants sont erronés. Cliquer sur le bouton "retour" et corrigez.

    ! ! Numéro carte lecteur vide
    !     ! ! Numéro de carte invalide
    !     ! ! Zone sexe vide
    !     ! ! Zone nom vide
    !     ! ! Zone prénom vide
    !     ! ! Adresse vide
    !     ! ! Commune vide
    !     !     ! --- 213,255 ---- ! Notes générales !

    ! ! " value=""> !
    !

    ERREUR

    !

    Les champs suivants contiennent une valeur interdite. Cliquez sur le bouton Précédent et essayez à nouveau :

    ! ! N° Carte
    ! ! ! N° carte invalide
    ! ! ! Sexe
    ! ! ! Prénoms
    ! ! ! Nom
    ! ! ! Rue
    ! ! ! Localité
    ! ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/opac-main.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-main.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- opac-main.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,133 **** ! ! Bienvenue sur l'OPAC Koha ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! Après la saisie, pressez la touche Entrée.
    ! -Recherche avancée ! (Plus d'ptions)
    ! ! !

    ! !

    Connecté en tant que: ! [Déconnexion]

    ! !

    Connectez-vous à Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue et Lecteur Services    		Rechercher dans le catalogue
       
    ! !
    ! ! Saisir in the box et press the enter key.
    ! ! ! -Recherche avancée (plus d'options)
    ! ! !

    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! !
    ! !
    !

    !

    Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** overdue.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- overdue.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,38 **** ! ! ! ! ! ! Documents en retard au
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Date de retourLecteurTéléphoneTitreAuteur
    ?subject=Overdue: ">
    ! ! ! ! ! ! ! \ No newline at end of file --- 1,32 ---- ! ! ! !

    Ouvrages en retard depuis


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Date de retourUtilisateurTéléphoneTitreAuteur
    ?subject=Signaler retard: ">
    ! ! ! ! Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/request.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** request.tmpl 17 Sep 2003 12:24:47 -0000 1.5 --- request.tmpl 11 Feb 2004 08:58:38 -0000 1.6 *************** *** 1,11 **** !

    ! "> ! "> ! Réserver : ! > ! )

    --- 1,11 ---- ! ! "> ! "> !

    Réserver: ! > !

    *************** *** 13,22 **** ! ! ! ! ! ! --- 13,22 ----
    /images/background-mem.gif">Ordre/images/background-mem.gif">N° lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Pris/images/background-mem.gif">Réservé
    ! ! ! ! ! ! *************** *** 24,162 **** ! !
    /images/background-mem.gif">Rang/images/background-mem.gif">N° Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Ramassage/images/background-mem.gif">Réservation
    ! Prochain dispo,
    (ou choisir dans la liste ci après)
    !

    ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Réservation/images/background-mem.gif">Type exemplaire/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Date pub/images/background-mem.gif">Copies
    ! ! Sélection impossible ! ! > ! > ! ! ! ! ! ! !
    !

     

    !
    action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>Modifier réservations existantes
    /images/background-mem.gif">Ordre/images/background-mem.gif">Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Pris/images/background-mem.gif">Réservé
    ! > ! > ! > ! Exemplaire en attente à > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Prochain dispo ! ! ! Seulement du type ! ! ! ! $type
    ! Supprimer une réservation en choisissant "Suppr" dans la la liste d'ordre ! //images/2rightarrow.png">
    --- 24,161 ---- ! ! ! Prochain dispo, ou choix dans la liste ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Réservation/images/background-mem.gif">Catég ouvrage/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Date de publication/images/background-mem.gif">Copies
    ! ! Ne peut pas être sélectionné ! ! > ! > ! ! ! ! ! ! !
    !
    +

     

    !
    action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODIFIER DEMANDES EXISTANTES
    /images/background-mem.gif">Rang/images/background-mem.gif">Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Ramassage/images/background-mem.gif">Réservation
    ! > ! > ! > ! Ouvrage en attente à > ! ! ! ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;"> ! ! ! ! Suivant ! ! ! This type only : ! ! ! !
    ! Supprimer une demande en sélectionnant "suppr." dans la liste. ! //images/2rightarrow.png"> !
    *************** *** 165,167 ****
    ! --- 164,166 ---- ! Index: searchheader.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/searchheader.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** searchheader.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- searchheader.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,4 **** ! >Résultats ! triés selon l'indice dewey | >Résultats ! triés selon la cote !
    --- 1,2 ---- ! >Résultats with dewey | >Résultats with biblionumber !
    Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** thesaurus_popup.tmpl 14 Nov 2003 22:00:44 -0000 1.3 --- thesaurus_popup.tmpl 11 Feb 2004 08:58:38 -0000 1.4 *************** *** 1,47 **** ! Saisie des entrées du thésaurus
    !

    ! Rechercher : "> ! "> ! "> !

    ! Descendre : ! "> ! "> ! "> ! ! !
    ! Sélectionner : ! "> ! "> ! ! "> ! ! !
    ! "> ! "> ! Insérer une nouvelle autorité : "> !
    ! ! --- 224,239 ----

    ! "> ! Reading Record ! ! ! Index: pay.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** pay.tmpl 18 Sep 2003 12:33:02 -0000 1.5 --- pay.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,49 **** ! ! Dettes à régler ! pour !

    ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! -
    AMENDES ! ET FRAISMONTANT ! DU
    ! " value="oui" checked>A payer ! ! " value="oui">Payé ! " value="wo">Abandonner ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value="">
     Montant total
    !

    !

     

    ! --- 1,48 ---- ! ! !

    Payer une amende pour

    +

    ! ! ! "> ! ! ! ! ! ! ! ! !
    AMENDES & FRAISMontant de l'avoir
    " value="no" checked>Unpaid ! " value="oui">Pay ! " value="wo">Writeoff ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value="">
    Total dû
    !
    +

    !

     

    ! !
    ! ">Return to Lecteur Record ! ! ! Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** readingrec.tmpl 18 Sep 2003 12:33:02 -0000 1.3 --- readingrec.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,38 **** ! ! ! ! ! ! ! ! ! !
    ! [&limit=full">Liste complète] ! [">Emprunts récents]
    &order=title&limit=">TITRE ! &order=author&limit=">AUTEUR ! ! &limit=">DATE Volume
    !   !   !   !  
    ! --- 1,55 ---- ! +

    +
    N° Lecteur: +
    N° Carte: +

    + + &limit=full">Full output +
    + +
    ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! &order=title&limit=">TITRE /images/background-mem.gif"> ! &order=author&limit=">AUTEUR /images/background-mem.gif"> ! &limit=">DATE RETOUR ! /images/background-mem.gif"> ! &order=returndate&limit=">RENDU ! /images/background-mem.gif"> Volume
    !   !   !   !   !   !
    ! !
    ! ">Return to Lecteur Record ! ! ! ! From tipaul at users.sourceforge.net Wed Feb 11 09:59:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:59:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters categoryitem.tmpl,1.1,1.2 admin-home.tmpl,1.5,1.6 aqbookfund.tmpl,1.4,1.5 aqbudget.tmpl,1.4,1.5 authorised_values.tmpl,1.6,1.7 branches.tmpl,1.6,1.7 categorie.tmpl,1.5,1.6 charges.tmpl,1.1,1.2 checkmarc.tmpl,1.3,1.4 currency.tmpl,1.1,1.2 itemtypes.tmpl,1.2,1.3 koha2marclinks.tmpl,1.3,1.4 marc_subfields_structure.tmpl,1.3,1.4 marctagstructure.tmpl,1.7,1.8 printers.tmpl,1.1,1.2 stopwords.tmpl,1.2,1.3 systempreferences.tmpl,1.3,1.4 thesaurus.tmpl,1.5,1.6 z3950servers.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27288/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Added Files: categoryitem.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** admin-home.tmpl 6 Oct 2003 13:40:49 -0000 1.5 --- admin-home.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,93 **** !

    ! Page d'administration de koha
    ! ! /images/background-mem.gif"> !
    Paramètres
    ! ! ! ! ! ! ! ! ! ! ! - - - - - - - ! ! ! ! ! ! ! ! ! ! ! ! !
    En rapport avec les bibliographies
    Types d'exemplairesLes supports physiques d'un exemplaire
    FondsLes différents fonds et leurs budgets
    AmendesLes amendes en fonction du type d'exemplaire et du type de lecteur.
    Valeurs autoriséesLes différentes catégories et les valeurs autorisées pour chaque catégorie. ! Les valeurs autorisées sont utilisées dans la saisie des notices MARc pour faciliter la saisie.
    ThésaurusGestion du thésaurus. Vous pouvez définir autant de thésaurus que nécessaires au travers de la définition de "catégories" de thésaurus
    MARC
    Structure MARCLa structure MARC : les champs et les sous champs
    Liens koha - structure MARCLes liens entre la base "standard" de koha et la base MARC. Notez que ces liens peuvent être définis depuis la structure MARC. Cet utilitaire est un raccourci pour valider et corriger les liens
    Vérifier la structure MARCVérifie la structure MARC. UTILISEZ-LE avant de travailler avec des données réelles. Il vous indiquera les erreurs de configuration qui CASSENT la cohérence de la base de données
    Divers
    AnnexesLes différentes annexes gérées par ce serveur koha
    catégoriesLes différents types de lecteurs
    MonnaiesLes monnaies des fournisseurs
    ImprimantesLes imprimantes (chemin UNIX)
    Mots videsListe des mots ignorés pendant les recherches
    serveurs Z39.50Serveurs z39.50 pour rechercher des notices
    Préférences systèmesLes préférences systèmes.
    ! ! /images/background-mem.gif"> !
    Utilitaires
    ! ! ! ! ! ! ! ! ! ! -
    Export
    Export de noticesExport au format MARC
    Import
    Décharger des notices MARC
    dans le réservoir    		Le réservoir est une table ou sont stockées des notices inactives.
    ! Une notice MARC est stockée dans le réservoir tant qu'il n'y pas d'exemplaire correspondant. Si vous entrez l'ISBN ou le titre d'un ouvrage, il est recherché dans le réservoir. ! S'il est trouvé, une notice active sera créée.
    ! --- 1,104 ---- !
    !

    Paramètres


    ! ! !
    Paramètres système
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
    AnnexesLes différentes annexes que vous gérez avec ce serveur Koha.
     
    ComptesAdministration des comptes. N'oubliez pas d'éditer vos comptes avant de commencer à éditer les budgets..
    MonnaiesDéfinir taux de change.
     
    Categ. ouvragesDéfinir types de document.
    Catégories d'emprunteursDéfinir catégories d'emprunteurs.
    FraisFrais en fonction du type de document / de lecteur.
     
    Valeurs autoriséesDéfinir des catégories et des valeurs autorisées pour eux. Les valeurs autorisées sont utilisées pour aider à l'édition des notices MARC..
    ThésaurusGestion du thésaurus et des fichiers autorités.
    Structure des étiquettes MARCstructure MARC: étiquettes puis sous-champs.
    Liens Koha - base de données MARCDéfinir les liens entre les bases de données standards Koha et MARC. Ces liens peuvent être définis à partir de la structure MARC. Cet outil est simplement un raccourci pour accélérer la création des liens..
    Vérification MARCContrôle la structure MARC. A utiliser avant de travailler avec de vraies données. Cela permet de mettre en évidence les erreurs qui peuvent corrompre la base de données.
    Divers paramètres
    ImprimantesImprinantes (chemin UNIX).
    Mots vide de sensMots effacés lors des recherches.
    Serveurs Z39.50serveurs à interroger pour des données MARC.
    Préférences systèmePréférences système.
    ! ! !
    Outils
    ! ! ! ! ! ! ! ! ! ! ! ! !
    Export
    Exporter une notice biblio MARC Exporter en format MARC.
    Importer
    Charger des notices MARC dans le réservoirLe réservoir est une table dans laquelle sont stockées des notices qui seront récupérées pour un catalogage rapide..
    ! Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** aqbookfund.tmpl 4 Jul 2003 14:04:02 -0000 1.4 --- aqbookfund.tmpl 11 Feb 2004 08:59:50 -0000 1.5 *************** *** 1,52 **** ! ! ! Gestion du fonds documentaire !
    ! ! !
    ! !
    ! Votre recherche : !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaireNomModifSuppr
    ?op=add_form&bookfundid= ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&bookfundid=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
     Budget">//images/filenew.png" ALT="Add budget" border=0>
      ! - : ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

          
    //images/filenew.png" ALT="Add budget" BORDER=0 >

    !

     

    !
    ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaire">
    Fonds documentaire
    Nom 
    Groupe
     
    !     Données enregistrées !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! !
    !

     

    ! ! ! ! Donnée supprimée !
    ! !     !
    /images/background-mem.gif">Fonds documentaire/images/background-mem.gif">
    Nom
    Groupe
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! !
    --- 101,143 ---- } !

    !
    ! ! ! ! ! !
    Compte>
    Compte
    Nom 
     
    ! ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! !
    !

     

    ! ! ! ! Donnée effacée ! ! ! ! Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** aqbudget.tmpl 4 Sep 2003 17:01:59 -0000 1.4 --- aqbudget.tmpl 11 Feb 2004 08:59:50 -0000 1.5 *************** *** 1,37 **** ! ! ! Gestion budgétaire !
    ! ! ! ! !
    ! Votre recherche !


    !

    Compte
    Nom
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! !
    /images/background-mem.gif">Fonds documentaire/images/background-mem.gif">Date de début/images/background-mem.gif">Date de fin/images/background-mem.gif">Montant du budget/images/background-mem.gif"> /images/background-mem.gif"> 
    ()">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    !
          
    //images/filenew.png" ALT="Add budget" BORDER=0 >

    !
    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaire>
    Fonds documentaire
    fonds">
    Date de début () 
    Date de fin ()
    Montant du budget">
     

    !

     

    !     Données enregistrées !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Budget/images/background-mem.gif">
    Date de début
    Date de fin
    Montant du budget
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! !
    !     ! ! ! Donnée supprimée !
    !     !     --- 77,149 ---- } !

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Compte>
    Nom de compte
    Comptes">
    Date de début () 
    Date de fin ()
    Montant budget
     ">

    !

     

    ! ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Compte ! ! !
    Date de début
    Date de fin
    budgetamount
    CONFIRMER SUPPRESSION
    ! ! ! ! Donnée effacée !
    ! ! Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** authorised_values.tmpl 21 Oct 2003 15:47:06 -0000 1.6 --- authorised_values.tmpl 11 Feb 2004 08:59:50 -0000 1.7 *************** *** 1,111 **** ! ! !

    !
    ! ! ! ! ! ! ! !
    Catégorie
    Valeur autorisée
    Lib
     ">
    !     ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! Gestion des valeurs autorisées !

    Cette table est utilisée pour la définition MARC. Vous pouvez définir autant de catégories que vous le souhaitez et autant de valeurs autorisées voulues dans chaque catégorie.

    !

    Lorsque vous définissez la structure de sous-champ MARC, il est possible de faire un lien entre le sous-champ et une valeur autorisée. Lorsque l'utilisateur demande à ajouter ou à modifier une notice le sous-champ ! n'est pas renseigné par un champ vide mais par une liste de valeurs autorisées.

    ! Nouvelle catégorie... ! !
    /images/background-mem.gif">Variable/images/background-mem.gif">
    Valeur
    CONFIRMEZ LA SUPPRESSION
    ! ! !
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Catégorie/images/background-mem.gif">Valeur autorisée/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! !
    ! "> !
    //images/filenew.png" border="0">
    !
    ! ! --- 1,104 ---- ! ! !

    !
    ! ! ! ! ! !
    Catégorie
    Valeur autorisée
    Lib
     ">
    ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! !

    Admin Valeurs autorisées

    !

    Cette table est utilisée dans les définitions MARC. Vous pouvez définir autant de catégories et autant de valeurs autorisées pour chaque catégorie que vous voulez.

    !

    Quand vous définissez la structure des sous-champs MARC, vous pouvez lier un sous-champ à une catégorie de valeurs autorisées. Quand l'utilisateur ajoute ou modifie une notice biblio, la valeur du sous-champ n'est pas libre, mais doit appartenir à la liste des valeurs autorisées.

    ! Nouvelle catégorie... ! !
    VariableLib
    Valeur
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    CatégorieValeur autoriséeLibEditerSupprimer
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! ! "> !

    ! ! ! Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branches.tmpl 4 Jul 2003 14:04:02 -0000 1.6 --- branches.tmpl 11 Feb 2004 08:59:50 -0000 1.7 *************** *** 1,81 **** ! ! !
    ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code annexe ! ! ! ! ! ! !
    Nom 
    ! !
    >
    Adresse
     
     
    Téléphone
    Fax
    E-mail
     
    !
    !     ! Confirmez la suppression : !
    ! ! ! ! !
    ! !
    !
    ! ! !
    ! !
    !
    --- 1,82 ---- ! ! ! !


    ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code Annexe ! ! ! ! ! ! !
    Nom"> 
    !
    >
    Adresse
     
     
    Téléphone
    Fax
    E-mail
     
    ! ! ! ! ! Confirmer suppression: !
    ! > !
    +
    + +
    + + + +


    + *************** *** 88,202 **** ! ! ! ! ! ! ! ! !
    Code AdresseCatégories    
    ! ! (nothing entered) ! ! ! ! !
    ! !
    ! !
    Ph:     ! !
    Fax:     ! !
    Email:     !     !     		! ! (no categories set) ! ! !
    !     !     !     		!
    ! ! !
    		!
    ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Catégories d'annexes
    NomCodeDescription  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !     ! !


    !
    ! ! ! --- 89,214 ---- ! ! ! ! ! ! ! ! !
    Code caté annexe ! ! ! ! ! !
    Nom"> 
    Description"> 
    Code AdresseCatégories    
    ! ! (pas de saisie) ! ! ! ! !
    ! !
    ! !
    Tél.: ! !
    Fax: ! !
    E-mail: ! !     		! ! (pas de catégorie définie) ! ! !
    ! ! !     		! ! ! ! !
    ! !

    +
    method=post> + + +
    + +
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Catégories Annexes !
    NomCodeDescription  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! ! !


    !
    ! ! ! *************** *** 205,221 ****
    Code Catégorie ! ! ! ! ! !
    Nom"> 
    Description"> 
    ! ! ! Confirmer suppression : !
    !
    !
    !
    !     ! --- 217,233 ---- ! ! ! Confirmer suppression: !
    !
    !
    !
    ! ! Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** categorie.tmpl 5 Nov 2003 11:15:51 -0000 1.5 --- categorie.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,5 **** ! ! ! !

    Modifier categorie

    ! !

    Ajouter categorie

    !     ! !
    name=Aform method=post> ! ! ! ! ! ! ! ! ! ! ! ! --- 60,141 ---- ! !

    Modifier Catégorie

    ! !

    Ajouter une catégorie

    ! ! ! name=Aform method=post>
    Code catégorie ! >
    Code catégorie
    Description !  
    Durée insc. !
    Age maximum !
    Age Minimum !
    Frais inscription !
    Dépassement
    Nb maxi emprunts ! >
    Frais réservation ! >
    ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 148,297 **** ! ! ! Valeurs enregistrées !
    method=post> !     ! ! TOTAL : :
    Code Catégorie ! ! >
    Code Catégorie
    Description !  
    Durée inscription !
    Age maxi !
    Age mini !
    Frais d'inscription !
    Avis de retard nécessaire
    Limite de prêt !
    Frais Réservation !
    ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Valeur supprimée !
    !     ! !

    Administration catégorie

    ! ! Rechercher sur ! ! !
    ! > ! !
    ! Code cat&éacute;gorie !
    Description
    Période inscription
    Age maximum
    Age minimum
    Profil
    ???
    Frais inscription
    DépassementOuiNon
    Nb maxi emprunts
    Frais réservation
    Valeur utilisée fois.Suppression impossible
    !
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    CatégorieDescriptionInscriptionAge maxiAge miniProfilDuréeFraisDepassnb max empruntfrais réserv
    OuiNon/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>//images/edittrash.png" border="0">
    !

    !

    ! ! --- 149,297 ---- ! ! ! Donnée enregistrée !
    method=post>
    ! ! ! TOTAL : :
    ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée effacée ! ! ! !

    Admin Catégorie

    ! ! Votre recherche sur ! ! ! ! > ! !
    ! Code Catégorie !
    Description
    Durée inscription
    Age maxi
    Age mini
    Saisir d'amende
    Frais d'inscription
    Avis de retard nécessaireOuiNon
    Limite de prêt
    Frais Réservation
    This record is used times. Deletion not possible
    !
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    CatégorieDescriptionDurée inscriptionFrais d'inscriptionAge maxiAge miniAmendeSignaler retardLimite de prêtRéserver
    ! Oui ! ! Non ! ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>//images/edittrash.png" border="0">
    !

    !

    ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** charges.tmpl 6 Oct 2003 13:40:49 -0000 1.1 --- charges.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,33 **** !

    ! Chaque zone doit être remplie avec : !

      !
    • Le montant de l'amende
      • !
    • Le retard toléré avant amende
      • !
    • La période de répétition de l'amende
      • !
    ! exemple : 1,7,7 1Euro d'amende après 7 jours, tous les 7 jours.

    !

    Note : Les amendes sont calculées par le script fines2.pl situé dans le répertoire misc. ! Demandez à votre administrateur de mettre ce script dans la crontab (après minuit) pour que les amendes soient calculées toutes les nuits.

    ! ! ! ! ! !
     
    ! "> ! " value="" size=6 maxlength=10>
    ! --- 1,27 ---- !

    ! Chaque champ/boîte doit être remplie avec le montant de l'amende, quand débute son calcul, sa périodicité
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, après 7 jours, chaque 7 jours

    !

    Note : les amendes sont calculées par le misc/script fines2.pl. Demandez à votre administrateur de mettre ce script dans le crontab, après minuit, pour que les amendes soient calculées chaque nuit

    ! ! ! ! ! !
     
    ! "> ! " value="" size=6 maxlength=10>
    ! Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** checkmarc.tmpl 4 Sep 2003 15:03:00 -0000 1.3 --- checkmarc.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,128 **** ! ! /images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TestResult
    itemnum
  • Le champ "itemnum" DOIT être connecté à un champs MARC
    • !
  • Le sous champ correspondant DOIT être dans le "tab" -1 (ignore)
    		•
    OKitemnum : le champ est connecté et dans le tab -1 (ignore)
    champ itemTOUS les sous champs des exemplaires (items) DOIVENT :
    !
  • être reliés à 1 seul champ MARC (995 à priori pour l'UNIMARC),
    • !
  • et ils doivent être dans le "tab" 10 (items)
    		•
    OKTous les sous-champs des exemplaires (items) sont dans le même champ et dans le tab 10 (items)
    Table itemtypes videLa table itemtypes est vide. Elle doit contenir au moins 1 entrée
    OKla table itemtypes contient 1 entrée au moins
    itemtype NON connecté Le champ biblioitems.itemtype DOIT :
    !
  • être connecté à un sous-champ MARC
    • !
  • Le sous champ correspondant DOIT avoir authorised_value=itemtype
    		•
    OKbiblioitems.itemtype défini
    table branch est videLa table "branches" est vide. Elle doit contenir au moins 1 entrée
    OKLa table "branches" contient au moins 1 entrée
    branch NON connectéle champ Koha items.homebranch field DOIT :
    !
  • être connecté à un sous-champ MARC,
    • !
  • Le sous-champ correspondant DOIT avec authorised value=branch
    		•
    OKhomebranch défini
    holdingbranch NON connectéle champ Koha items.holdingbranch field DOIT :
    !
  • être connecté à un sous-champ MARC,
    • !
  • Le sous-champ correspondant DOIT avec authorised value=branch
    		•
    OKholdingbranch défini
    biblio et biblionumberLes champs Koha biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
    !
  • être reliés à un sous-champ MARC
    • !
  • être connectés au même champ marc(par exemple : 090$a et 090$b)
    • !
  • Etre dans le "tab" -1
    		•
    OKbiblionumber et biblioitemnumber correctement définis
    TOTALIl y a erreurs dans votre configuration MARC. corrigez les avant d'utiliser Koha !!!
     Configuration OK, pas d'erreur dans les paramètres MARC
    ! --- 1,129 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TestRésultat
    itemnum
  • Le champ itemnumb DOIT être connecté
    • !
  • Le sous-champ correspondant DOIT être dans l'onglet -1 (ignore)
    		•
    OKOuvrage : le champ itemnumber est connecté à un sous-champ dans un onglet -1
    champ ouvrageTOUS les champs ouvrage DOIVENT :
    !
  • être relié à la même étiquette,
    • !
  • et ils doivent tous être dans l'onglet 10 (items)
    		•
    OKLes étiquettes d'exemplaire sont dans le même champ MARC et dans le même onglet.
    table types d'ouvrage est videLa table types d'ouvrage est vide. Elle doit contenir au moins une valeur
    OKtable types d'ouvrage remplie avec au moins une valeur
    itemtype n'est PAS connecté Le champ biblioitems.itemtype DOIT :
    !
  • être relié à l'étiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autorisée=typeouvrage
    		•
    OKchamp biblioitems.itemtype défini
    Table Annexe videLa table Annexe est vide. Elle doit contenir au moins une valeur !
    OKtable Annexe remplie avec au moins une valeur
    Annexe propriétaire non reliéele champ items.homebranch DOIT :
    !
  • être relié à l'étiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autorisée=annexes
    		•
    OKAnnexe propriétaire définie
    Annexe dépositaire non reliéele champ items.holdingbranch DOIT :
    !
  • être relié à l'étiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autorisée=annexes
    		•
    OKAnnexe dépositaire définie
    notice bibliographique et n° biblioLes champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
    !
  • être relié à l'étiquette MARC,
    • !
  • être dans la MEME étiquette (par ex. : 090$a et 090$b)
    • !
  • être dans l'onglet -1 (items)
    		•
    OKn° biblio et n° d'ouvrage corrects
    TOTALVous avez erreurs dans votre configuration MARC. Corrigez-les avant d'utiliser Koha
     Configuration OK. Vous n'avez pas d'erreurs dans la table des paramètres MARC.
    ! Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** currency.tmpl 6 May 2003 14:56:40 -0000 1.1 --- currency.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! ! !

    Modifier monnaie

    ! !

    Ajout monnaie

    !     !
    ! ! --- 56,78 ---- ! !

    Modifier Monnaie

    ! !

    Ajouter une monnaie

    ! !
    Monnaie !
    Monnaie
    ! ! *************** *** 81,90 **** ! --- 81,90 ---- ! *************** *** 96,127 **** ! ! ! Donnée enregistrée !
    !     !
    Monnaie !
    Monnaie
    Taux !
    Taux !
    ! ! ! ! ! --- 96,127 ---- ! ! ! Donnée enregistrée ! ! !
    Monnaie
    Taux
    ! Cette donnée est utilisée fois. Suppression impossible
    ! ! ! ! ! *************** *** 129,138 **** ! --- 129,138 ---- ! *************** *** 140,173 **** !
    Monnaie
    Taux
    ! This record is used times. Deletion not possible
    !
    CONFIRMER SUPPRESSION !
    CONFIRMER SUPPRESSION
    ! !
    ! ! ! Donnée supprimée !
    !     ! !

    Monnaies

    !
    ! > !
    ! ! Rechercher sur : ! --- 140,173 ---- !
    ! !
    ! ! ! Donnée effacée !
    ! ! !

    Admin Monnaies

    !
    ! > !
    ! ! Votre recherche sur ! *************** *** 178,211 **** ! ! ! ! ! ! !
    EditerSupprimer
    !
    ! ! << Prec !        ! ! Suiv >> !
    !
    !     ! --- 178,211 ---- ! ! ! ! ! Editer ! Supprimer ! !
    ! ! << Prev !        ! ! Suivant >> !
    !
    ! ! Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** itemtypes.tmpl 6 Nov 2003 10:18:34 -0000 1.2 --- itemtypes.tmpl 11 Feb 2004 08:59:50 -0000 1.3 *************** *** 1,3 **** ! ! ! !

    Modifier le type d'exemplaire

    ! !

    Ajouter le type d'exemplaire

    !     !
    ! ! ! ! ! ! ! ! ! ! ! ! --- 60,107 ---- } ! ! !

    Modifier categ. ouvrage

    ! !

    Ajouter catégorie d'ouvrage

    ! !
    Type exemplaire>
    Type exemplaire
    Description 
    Durée d'emprunt
    Renouvellement autorisécoché value=1>
    Coût emprunt
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 97,150 ****
    Catég ouvrage>
    Catég ouvrage
    Description 
    Non empruntable ! ! ! ! ! ! Si coché, aucun ouvrage de ce type ne peut être emprunté. Sinon, les ouvrages peuvent être empruntés sauf si le champ "notforloan" de l'ouvrage est coché. !
    Durée de prêt ! ! Utilisé seulement si "Non empruntable" n'est pas coché. !
    Renouvellements autoriséschecked value=1>
    Coût du prêt
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type exemplaire
    Description
    Durée emprunt
    RenouvellementAutoriséPas autorisé
    Coût emprunt
    Cette donnée est utilisée fois. Suppression impossible
    CONFIRMER SUPPRESSION
    !     ! !

    Administration type exemplaire

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code ! DescriptionDurée empruntRenouvelableCoûtModifierSupprimer
    YesNo?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

    --- 111,164 ----
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catég ouvrage
    Description
    Durée de prêt
    RenouvellementsAllowedNot allowed
    Coût du prêt
    This record is used times. Deletion not possible
    CONFIRMER SUPPRESSION
    ! ! !

    Admin Categ ouvrage

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code ! DescriptionDurée de prêtRenouvelableFraisEditerSupprimer
    OuiNon?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

    *************** *** 152,162 **** ! ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    !     ! --- 166,176 ---- ! ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/koha2marclinks.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** koha2marclinks.tmpl 14 Oct 2003 09:45:29 -0000 1.3 --- koha2marclinks.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,16 **** ! ! !

    !

    Choisir et valider 1 parmi les suivants :.

    !
    ! "> ! "> ! --- 1,16 ---- ! ! !

    !

    Choisir et valider une des suivantes pour .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! "> ! "> ! *************** *** 20,29 ****
    ! "> ! "> ! --- 20,29 ----
    ! "> ! "> ! *************** *** 33,42 ****
    ! "> ! "> ! --- 33,42 ----
    ! "> ! "> ! *************** *** 46,55 ****
    ! "> ! "> ! --- 46,55 ----
    ! "> ! "> ! *************** *** 59,68 ****
    ! "> ! "> ! --- 59,68 ----
    ! "> ! "> ! *************** *** 72,81 ****
    ! "> ! "> ! --- 72,81 ----
    ! "> ! "> ! *************** *** 85,94 ****
    ! "> ! "> ! --- 85,94 ----
    ! "> ! "> ! *************** *** 98,107 ****
    ! "> ! "> ! --- 98,107 ----
    ! "> ! "> ! *************** *** 111,120 ****
    ! "> ! "> ! --- 111,120 ----
    ! "> ! "> ! *************** *** 124,133 ****
    ! "> ! "> ! --- 124,133 ----
    ! "> ! "> ! *************** *** 138,183 ****
    !

    Pour déconnecter cliquer ==>

    		 ! ! "> ! "> !
    ! ! ! Liens MARC !

    NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez à votre administrateur d'exécuter le script misc/rebuildnonmarc.pl

    !
    ! ! ! ! ! ! ! ! ! ! ! !
    Champ Koha ?ChampSous-champLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    !
    ! --- 138,183 ----
    !

    Pour "déconnecter" cliquer ==>

    		 !
    ! "> ! "> !
    ! ! ! Liens MARC !

    Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl.

    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    champ Koha ?EtiquetteSous-champLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** marc_subfields_structure.tmpl 4 Jul 2003 14:04:02 -0000 1.3 --- marc_subfields_structure.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,129 **** ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Champliblibrarian / libopacIncrementationObligatoireChamp KohaBaliseValeur authorisée ou catégorie de thésaurus
    -
    !
    ! ou
    ! ou
    ! !

    Remarque : dans la dernière colonne vous avez le choix entre : !

      !
    • Une "valeur authorisée": qui se réfère ! à une liste de valeurs authorisées pour ce sous champ. Voir ! le tableau correspondant (admin table)
      • !
    • Une "catégorie thesaurus". Voir le tableau correspondant ! (admin table)
      • !
    • Un "créateur de valeurs" : les créateurs de valeurs ! sont des programmes Perl qui vous aident à sélectionner la ! valeur d'un champ. Ils sont dépendants de MARC et remplissent parfois ! automatiquement un autre sous champ.
      • !
    !

    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Données effacées !
    !
    /images/background-mem.gif">Sous champ/images/background-mem.gif">
     
    CONFIRMEZ LA SUPPRESSION
    ! !
    "> ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" width=5%>Sous-champ/images/background-mem.gif" width=30%>Libellé/images/background-mem.gif" width=10%>champ koha ?/images/background-mem.gif" width=8%>Rep ?/images/background-mem.gif" width=8%>Oblig ?/images/background-mem.gif" width=8%>Onglet ?/images/background-mem.gif" width=8%>Val. autorisée ?/images/background-mem.gif" width=8%>Thesaurus ?/images/background-mem.gif" width=8%>Plug-in ?/images/background-mem.gif" width=8%> 
    OuiNonOuiNon">//images/edittrash.png" border="0">
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    !     ! --- 1,112 ---- ! ! ! ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ChampLibellé OPACRepetobligatoirechamp KohaOngletValeur autorisée ou
    ! Catégorie thésaurus
    - " size=40 maxlength=80>
    ! " size=40 maxlength=80>
    ! ou
    ! ou
    !

    Note: dans la dernière colonne, vous pouvez choisir: !

    • Une "valeur autorisée": se réfère à une liste de valeurs autorisées pour ce sous-champs. Voir la table admin correspondante..
      • !
    • Une "catégorie thésaurus": se réfère à une catégorie du thésaurus. Voir la table admin correspondante..
      • !
    • Un "constructeur de valeur": les constructeurs de valeurs sont des programmes Perl qui vous aide à sélectionner les entrées d'un champ selon une syntaxe MARC. Ils remplissent aussi parfois automatiquement des sous-champs..
      • !
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée effacée ! /images/background-mem.gif" width=5%>Sous-champ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sous-champ
     
    CONFIRMER SUPPRESSION
    ">
    Libchamp Koha ?Rep ?obligatoire ?Onglet ?Valeur autorisée ?Thésaurus ?Val build ?Supprimer
    OuiNonOuiNon">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.7 --- marctagstructure.tmpl 11 Feb 2004 08:59:50 -0000 1.8 *************** *** 1,4 **** ! ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Champs
    Liblibrarian
    Libopac
    Incrementation
    Obligatoire
    Valeur autorisée (si vous sélectionnez une ! valeur ici, les indicateurs seront limités à la seule liste ! de valeurs autorisées)
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! Données effacées !
    !     ! ! Gestion de la structure de balisage MARC !

    NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez à votre administrateur d'exécuter le script misc/rebuildnonmarc.pl

    !
    ! ! !
    /images/background-mem.gif">Balise/images/background-mem.gif">
     
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! -
    /images/background-mem.gif" width="5%">Balise/images/background-mem.gif" width="45%">Libellé/images/background-mem.gif" width="5%">Répétable/images/background-mem.gif" width="5%">Obligatoire/images/background-mem.gif" width="10%">Valeurs
    		/images/background-mem.gif" width="16%">Sous champs/images/background-mem.gif" width="7%"> /images/background-mem.gif" width="7%"> 
    OUINONOUINON">Sous champs">//images/fileopen.png" border="0" height="25">">//images/edittrash.png" border="0" height="25">
    -
    - - - - - -
    ! //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    !     ! ! --- 52,152 ---- ! !

    !
    ! ! ! ! ! !
    Etiquette
    Libellé bibliothécaire
    Lib pour l'opac
    Répétable
    Obligatoire
    Valeur autorisée (Si vous sélectionnez une valeur ici, les indicateurs seront limités une liste de valeurs autorisées)
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée effacée ! ! ! !

    Admin Structure étiquette MARC

    ! Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl. ! ! ! !
    /images/background-mem.gif">etiquette/images/background-mem.gif">
     
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Etiquette/images/background-mem.gif">Lib/images/background-mem.gif">Répétable/images/background-mem.gif">Obligatoire/images/background-mem.gif">Autorisé
    valeur    		/images/background-mem.gif">Sous-champs/images/background-mem.gif">Editer/images/background-mem.gif">Supprimer
    OuiNonOuiNon">subfields">//images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">//images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    + +
    ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! ! Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** printers.tmpl 6 May 2003 14:56:40 -0000 1.1 --- printers.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! !

    Modifier imprimante

    ! !

    Ajout imprimante

    !     !
    --- 56,66 ---- !

    Modifier imprimante

    ! !

    Ajouter une imprimante

    ! ! *************** *** 68,94 **** ! ! ! ! ! ! ! ! --- 68,94 ----
    Nom imprimante !
    Nom imprimante
    Queue
    Type
    ! ! ! ! ! ! ! ! *************** *** 99,129 **** ! ! ! Donnée enregistrée !
    !     !
    Nom Imprimante !
    Nom Imprimante
    Queue
    Saisir
    ! ! ! ! ! ! --- 99,129 ---- ! ! ! Donnée enregistrée ! ! !
    Imprimante
    Queue
    Type
    ! ! ! ! ! ! *************** *** 132,140 ****
    Imprimante
    Queue
    Saisir
    ! !
    --- 132,140 ----
    ! !
    *************** *** 142,164 ****
    ! ! ! Donnée supprimée !
    !     ! !

    Imprimantes

    ! > !
    ! ! Rechercher sur : ! --- 142,164 ----
    ! ! ! Donnée effacée !
    ! ! !

    Admin Imprimante

    ! > !
    ! ! Votre recherche sur ! *************** *** 166,203 **** ! ! ! ! ! ! ! ! !
    Nom QueueType
    EditDelete
    !
    ! ! << Prec ! ! ! ! ! Suiv >> !
    !
    !     ! --- 166,204 ---- Nom Queue ! Saisir ! ! ! ! ! ! Editer ! Supprimer ! !
    ! ! << Prev ! ! !        ! ! ! Suivant >> !
    !
    ! ! Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** stopwords.tmpl 24 Nov 2003 17:00:09 -0000 1.2 --- stopwords.tmpl 11 Feb 2004 08:59:50 -0000 1.3 *************** *** 1,5 **** ! ! ! !

    Modifier mot vide

    ! !

    Ajouter mot vide

    !     !
    ! ! ! ! ! ! --- 53,81 ---- ! !

    Modifier un mot

    ! !

    Ajouter un mot

    ! !
    Mot vide !
    Mot vide
    ! ! ! ! ! ! *************** *** 84,106 ****
    Mot !
    Mot
    !     ! ! Mot vide enregistré !
    !     ! ! ! ! ! --- 84,106 ----
    Mot vide
    ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! *************** *** 109,117 ****
    Mot
    ! !
    --- 109,117 ----
    ! !
    *************** *** 119,173 ****
    !     ! ! Donnée supprimée !
    !     ! !

    Mots vides

    ! NOTE : Si vous modifiez cette table, demandez à votre administrateur système d'exécuter le script misc/rebuildnonmarc.pl !
    ! > !
    ! ! Rechercher sur ! ! ! ! ! ! ! !
    Mot vide
    Delete
    !
    ! ! << Prec ! ! ! ! Suiv >> !
    !
    !     ! --- 119,175 ---- ! ! ! Donnée effacée !
    ! ! !

    Admin Mots vide

    ! Note : si vous changez quelque chose dans cette table, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl. !
    ! > !
    ! ! Votre recherche sur ! ! ! ! ! ! ! !
    Mot
    Supprimer
    !
    ! ! << Prev ! ! !        ! ! ! Suivant >> !
    !
    ! ! Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** systempreferences.tmpl 19 May 2003 13:53:46 -0000 1.3 --- systempreferences.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,3 **** ! ! ! ! !

    Modifier préférence système

    ! !

    Ajouter préférence système

    !     !
    ! ! ! ! ! !
    Variable
    Variable
    Value
    Explanation
     
    !     ! ! Donnée enregistrée !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donnée supprimée !
    !     ! ! ! Administration des préférences systèmes
    ! !
    /images/background-mem.gif">Variable/images/background-mem.gif">
    Value
    Confirmez la suppression
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Paramètre/images/background-mem.gif">Valeur/images/background-mem.gif">Explication/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    - - ! !
    -
    //images/filenew.png" border="0">
    -     ! --- 55,153 ---- ! ! ! !

    Modifier une préférence système

    ! !

    Ajouter une préférence système

    ! !
    ! ! ! ! ! !
    Variable
    Variable
    Valeur">
    Explication">
     
    ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! ! ! ! ! !
    Variable
    Valeur
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! Donnée effacée !
    ! ! ! !

    Admin Préférences système

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    VariableValeurExplication  
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>Editer">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>Supprimer
    ! !
    !
    method=post> ! ! !
    ! ! ! ! ! Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** thesaurus.tmpl 10 Jul 2003 14:11:46 -0000 1.5 --- thesaurus.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,161 **** ! ! ! Gestion du thesaurus
    ! !
    /images/background-mem.gif">Valeurs relatives à ! ()


    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Autres formes/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    !
    ! "> ! "> !
    //images/filenew.png" border="0">
    !
    ! !

    ModificationAjout

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catégorie
    Forme d'autorité" >" maxlength="80" size="80">
    Autre forme
     "> ! "> ! "> ! "> ! "> ! ">
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! !
    /images/background-mem.gif">lib/images/background-mem.gif">
    Valeur
    CONFIRMEZ LA SUPPRESSION de cet enregistrement ! et de tous les enregistrements dépendant de celui-ci
    ! ! !
    ! !
    !     ! ! Gestion du thesaurus !

    Gère le thésaurus et les listes d'autorité.
    !

      ! Creuser : voir les données dépendantes de celle-ci
      ! Formes exclues : voir d'autres formes de ce terme d'autorité

      !
    !
    ! ! "> ! ! Nouvelle catégorie... ! ! ! &rechercher catégorie=">
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" width="5%"> /images/background-mem.gif">Forme libre/images/background-mem.gif">Autorité/images/background-mem.gif" width="8%">Creuser/images/background-mem.gif" width="8%">Exclues/images/background-mem.gif" width="8%"> /images/background-mem.gif" width="8%"> 
      CreuserExclues">//images/fileopen.png" border="0" height="25">">//images/edittrash.png" border="0" height="25">
    ! ! ! ! !
    !
    ! ! "> ! "> ! "> !
    //images/filenew.png" border="0">
    ! !
    ! ! --- 1,155 ---- ! ! ! Gestion du thésaurus
    ! !
    En liaison avec ()


    ! ! ! ! ! ! ! ! ! ! ! !
    autres formulaires  
    ">Editer">Supprimer
    ! ! "> ! "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Add" BORDER=0 >
    ! ! ! !

    ModifierAjouter

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catégorie
    Libellé autorité" >" maxlength="80" size="80">
    Autre forme" maxlength="80" size="80">
     "> ! "> ! "> ! "> ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! !
    lib
    Valeur
    !
    ! ! ! "> !
    CONFIRMER SUPPRESSION de cette entrée et toutes les entrées dépendantes de celle-ci
    ! ! !

    Gestion du thésaurus

    !

    Gestion du thésaurus et des fichiers autorités.
    !

      ! Extraire: Voir les formes associées
      ! Lié: Voir les formes rejetées

      !
    !
    ! ! "> ! ! Nouvelle catégorie... !
    ! ! &search_category=">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     Formulaire libreAutoritéExtraireLiéEditerSupprimer
      Extraire  Lié">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !
    ! ! ! ! ! !
    " class="button">Previous" class="button"> Next
    !
    ! ! ! "> ! "> ! "> !

    ! ! ! ! ! Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** z3950servers.tmpl 6 May 2003 14:56:40 -0000 1.1 --- z3950servers.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! ! !

    ModifierServeur Z39.50

    ! !

    Ajouter Serveur Z39.50

    !     !
    ! ! ! ! ! --- 71,104 ---- ! !

    Modifier serveur Z39.50

    ! !

    Ajouter un serveur Z39.50

    ! !
    Serveur Z39.50 !
    Server Z39.50
    Hostname !
    ! ! ! ! ! *************** *** 106,145 **** ! ! ! ! ! ! ! ! ! ! ! !
    Serveur Z39.50 !
    Serveur Z39.50
    Nom de l'hébergeur !
    Port !
    Database !
    Userid !
    Password !
    Actif !
    Priorité (d'affichage) !
    Syntaxe (les serveurs renvoient les données dans des formats variables. En choisir un) --- 106,145 ---- Port !
    Base de données !
    Identifiant utilisateur !
    Mot de passe !
    Coché (recherche par défaut) !
    Rang (ordre d'affichage) !
    Syntaxe (Z39.50 peut envoyer des notices en différents formats. Sélectionnez lequel) *************** *** 154,208 ****
    !     ! ! Donnée enregistrée !
    !     ! ! ! ! ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! --- 154,208 ----
    Site !
    Hostname
    Port
    Database
    Userid
    Password
    Checked
    Rank
    ! ! ! Donnée enregistrée !
    ! ! ! ! ! ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 210,288 **** ! !
    Site !
    Nom de l'hébergeur
    Port
    Base de données
    Identifiant utilisateur
    Mot de passe
    Vérifié
    Rang
    !     ! ! Donnée supprimée !
    !     ! !

    Serveurs z3950

    !
    ! > !
    ! ! Rechercher sur ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SiteHostnamePortDatabaseUseridPasswordCheckedRankSyntax
    //images/fileopen.png" ALT="Edit" title="edit" BORDER=0 >//images/edittrash.png" ALT="Delete" title="delete" BORDER=0 >
    !
    ! ! << Prec !        ! ! suiv >> !
    !
    !     ! --- 210,288 ---- ! !
    ! ! ! Donnée effacée !
    ! ! !

    Admin Serveurs Z39.50

    !
    ! > !
    ! ! Votre recherche sur ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SiteNom de l'hébergeurPortBase de donnéesIdentifiant utilisateurMot de passeVérifiéRangSyntaxe
    //images/fileopen.png" ALT="Edit" title="éditer" BORDER=0 >//images/edittrash.png" ALT="Delete" title="supprimer" BORDER=0 >
    !
    ! ! << Prev !        ! ! Suivant >> !
    !
    ! ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:23 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ selectbranchprinter.tmpl,1.1,1.2 branchtransfers.tmpl,1.4,1.5 circulation.tmpl,1.8,1.9 returns.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/circ Modified Files: branchtransfers.tmpl circulation.tmpl returns.tmpl Added Files: selectbranchprinter.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** branchtransfers.tmpl 22 Sep 2003 13:05:17 -0000 1.4 --- branchtransfers.tmpl 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 1,75 **** !
    ! Prêt   ! Retours
    !

    Circulation: Transferts

    ! Annexe :
    ! Imprimante : Modifier ! > ! >

    ! ! ! > ! > !

    ! !

    /images/background-mem.gif">Réservation
    ! Reservé : Réservation trouvée pour (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Exemplaire en attente :
    ! L'exemplaire est marqué en attente à pour (" onClick="openWindow(this,'Member', 480, 640); return false;">).
     ! ! --- 1,78 ---- !
    ! Marquer reservation et transférer exemplaire à : ! Supprimer réservation et transférer :
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    supprimer réservation et transférer:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignorer et retourner au transfert:
    ! > ! ! value=> ! value=> ! value=> ! !
    ! ! Emprunteur suivant ! ! Retours
    !

    Circulation: Transferts


    ! Annexe:   ! Imprimante:
    ! Changer Paramètres ! > ! >

    ! !
    /images/background-mem.gif">Réservation trouvée
    ! Réservé: Réservation trouvée pour (" onClick="openWindow(this,'Lecteur', 480, 640); return false;">). ! Ouvrage marqué en attente:
    ! Ouvrage est marqué en attente à for (" onClick="openWindow(this,'Lecteur', 480, 640); return false;">).
    ! ! *************** *** 77,159 ****
    ! Changer Réserver en "en attente" et transférer le livre vers : ! Annuler réservation et tenter un transfert:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Annuler réservation et tenter un transfert:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignorer et retourner aux transferts:
    ! > ! ! value=> ! value=> ! value=> ! !
    ! !
    /images/background-mem.gif">Messages
    ! ! Réservation annulée
    !     ! ! Exemplaire marqué en attente au site :
    !     !     ! ! ! Pas d'exemplaire avec le code barre : ! ! ! Renvoyer exemplaire à son propriétaire : ! ! ! L'exemplaire est déjà noté arrivé. ! ! ! Exemplaire emprunté par " ! onClick="openWindow(this,'Member', 480, 640); return false;"> ! et rendu !
    !
    ! /images/holder.gif" width=24 height=24>
    ! !
    /images/background-mem.gif"> ! Selectionner site
    Site destination :
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Code barre de l'exemplaire
    Code barre exemplaire:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Exemplaires transférés
    Code barreTitreAuteurTypedeà
    align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center> align=center> align=center>
    ! ! ! --- 80,162 ----

    ! !
    /images/background-mem.gif">Messages
    ! ! Réservation annulée
    ! ! ! Ouvrage doit être en attente à l'annexe:
    ! ! ! ! ! No Ouvrage with barcode: ! ! ! Please return item to home branch: ! ! ! Ouvrage is already at destination branch. ! ! ! Ouvrage was on loan to " ! onClick="openWindow(this,'Lecteur', 480, 640); return false;"> ! et a été retourné. !
    !
    ! /images/holder.gif" width=24 height=24>

    ! !
    /images/background-mem.gif"> ! Sélectionner une annexe
    Annexe de destination:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Entrer Code barre du livre
    Code barre d'un ouvrage:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Ouvrages transférés
    Code barreTitreAuteurSaisirDeà
    > ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">>> >>>
    ! ! ! Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** circulation.tmpl 29 Oct 2003 23:38:05 -0000 1.8 --- circulation.tmpl 11 Feb 2004 09:00:21 -0000 1.9 *************** *** 1,33 **** ! ! !
    ! &branch=&printer=&print=yes> ! Suivant  ! Retours  ! Transferts
    !

    Circulation: Retours


    ! Annexe:
    ! Imprimante:
    ! Modification paramètres
    ! > ! > !

    ! ! !

    ! Retours   ! Transferts --- 1,30 ---- ! ! !
    ! &printer=&print=oui"> ! Emprunteur suivant  ! Retours  ! Transferts
    !

    Circulation: Prêts

    ! Annexe: Imprimante: Changer Paramètres ! "> ! "> ! !
    ! Retours   ! Transferts *************** *** 35,61 ****
    !

    Circulation: Emprunts

    ! Annexe :
    ! Imprimante : Modifier
    !
    /images/background-mem.gif"> ! Question
    ! --- 32,59 ----
    ! Demande d'emprunt de ! par to . !

    !

    Circulation: Prêts


    ! Annexe:
    ! Imprimante:
    ! Changer Paramètres ! "> ! "> !

     

    ! ! ! ! ! ! --- 28,58 ---- ! ! *************** *** 61,68 **** ! ! --- 61,68 ---- ! ! Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parameters-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- parameters-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** parameters-top.inc 7 Aug 2003 14:19:55 -0000 1.10 --- parameters-top.inc 11 Feb 2004 09:00:20 -0000 1.11 *************** *** 3,8 **** ! KOHA: INTRANET: Parameters ! /includes/common-style.css"> ! KOHA: INTRANET: Paramètres ! /includes/common-style.css">
    /images/background-mem.gif"> ! Question sur le prêt
    ! *************** *** 64,104 **** !
    ! Attempting to issue ! by to . !

    ! --- 62,102 ---- ! ! ! !
    !
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    		!
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    ! *************** *** 109,218 ****
    !
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    		!
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    ! !
    Erreur emprunt

    ! ! ! ! !
    /images/background-mem.gif">Messages
    !     ! !
    ! > ! > ! ! !
    /images/background-mem.gif"> ! Selectionner lecteur
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! entrer un numéro de carte lecteur
    ou une partie de son nom
    ! ! > ! >
    !     !
    ! *************** *** 176,182 ****
    !
    ! ! ! ! !
    ! ! ! --- 107,216 ----
    /images/background-mem.gif"> ! Code barre exemplaire
    ! ! ! ! !
    code barre :
    !
    ! ! !
    ! > Fixer date retour
    ! > ! > ! > ! ! ! ! > !
    ! !
    Erreur prêt d'un livre

    ! ! ! ! !
    /images/background-mem.gif">Messages
    ! ! ! ! "> ! "> ! ! !
    /images/background-mem.gif"> ! Sélectionner un emprunteur
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Entrer N° carte de lecteur
    ou partie du nom
    ! ! "> ! ">
    ! ! !
    !
    ! !
    ! ! ! *************** *** 224,311 ****
    /images/background-mem.gif"> ! Entrer Code barre du livre
    ! ! ! ! !
    Code barre d'un ouvrage:
    !
    ! ! !
    ! > Sticky Date de retour
    ! "> ! "> ! "> ! ! ! ! "> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Informations lecteur
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Catégorie:
    Frais> onClick=\"openWindow(this, 'Payment', 480,640)\">Paiement
    Frais onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    En attente ! ! &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
    !
    RetardsOui, voir ci-dessous
    Notes
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Emprunts du jour
    Retour pour leCode barreTitreAuteurClasse
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Autres emprunts
    Retour pour leCode barreTitreAuteurClasse
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     - --- 222,318 ----

    		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Informations emprunteur
    ! " onClick="openWindow(this,'Lecteur', 480, 640)"> ! !
    Category:
    GNA>Emprunteur is gone with no address
    PERDU>Emprunteur's card is lost
    DBARRED>Emprunteur is debarred
    FRAIS>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    FRAIS" onClick="openWindow(this, 'Payment', 480,640)">Payment
    EN ATTENTE ! ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640)"> ()
    !
    RETARDSOui, voir plus bas
    NOTES
    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Prêts d'aujourd'hui
    Date de retourCode barreTitreAuteurCatégorie
    >> ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">">">">
    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Prêts précédents
    Date de retourCode barreTitreAuteurCatégorie
    ">"> ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">">">">
    ! ! Index: returns.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** returns.tmpl 22 Sep 2003 13:05:17 -0000 1.4 --- returns.tmpl 11 Feb 2004 09:00:21 -0000 1.5 *************** *** 1,94 **** !
    ! Prêts !  Transfers
    !

    Circulation: Retours

    ! Annexe :
    ! Imprimante : Modifier ! > ! >

    ! --- 1,97 ---- !
    !
    /images/background-mem.gif">Réservations trouvées
    ! ! Exemplaires en attente :
    ! L'exemplaire ()
    ! est en attente à pour (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
    ! ! value=> ! value=> ! value=> !
    !     ! ! Item marked Waiting:
    ! L'exemplaire : ()
    ! doit être transféré à
    ! pour être emprunté par (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
    ! ! ! value=> ! value=> ! value=> ! !
    !     ! ! Reservation trouvée : Exemplaire : () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
    ! pour (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false">) Pour être ramassé à . !
    Modifier statut ("attente") et imprimer déplacer?:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! Exemplaire réservé : () ! Code barre : ! Type : ! Provenant de : ! ! Emprunté par : ! ! carte N°: ! Tel : ! ! ! ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "> !
    !
    ! ! Prêts  ! ! Transferts
    !

    Circulation: Retours


    ! Annexe:   ! Imprimante:
    ! Changer Paramètres ! > ! >

    ! *************** *** 96,151 **** ! !
    !
    /images/background-mem.gif">Réservation trouvée
    ! ! Ouvrage marqué en attente:
    ! Ouvrage ()
    ! est marqué en attente à for (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false;">).
    ! ! value=> ! value=> ! value=> !
    ! ! ! Ouvrage marqué en attente:
    ! Ouvrage: ()
    ! doit être transféré vers
    ! pour être retiré à (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false;">).
    ! ! ! value=> ! value=> ! value=> ! !
    ! ! ! Réservation trouvée: Ouvrage: () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;">
    ! for (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false">) to be collected at . !
    Mettre le statut "Attente" et imprimerslip?:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ITEM RESERVED: () ! barcode: ! itemtype: ! COLLECT AT: ! ! BORROWER: ! ! card number: ! Téléphone: ! ! ! ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "> !
    !
    !
    ! !
    /images/background-mem.gif"> ! code barre exemplaire
    code barre :
    ! ! value=> ! value=> ! value=> !
    		! !
    /images/background-mem.gif">Messages
    ! ! ! code barre inconnu: ! ! ! Retourner à ! ! ! Pas emprunté. ! ! ! Exemplaire perdu. Marqué retrouvé. ! ! ! Exemplaire éliminé !
    !
    !
    /images/background-mem.gif"> ! Retour d'exemplaire
    ! Titre:
    --- 99,154 ----
    !
    ! !
    /images/background-mem.gif"> ! Entrer Code barre du livre
    Code barre d'un ouvrage:
    ! ! value=> ! value=> ! value=> !
    		! !
    /images/background-mem.gif">Messages
    ! ! ! No Ouvrage with barcode: ! ! ! Please return to ! ! ! Not On Prêt. ! ! ! Ouvrage was lost, now found. ! ! ! Ouvrage Annulé !
    !
    !
    /images/background-mem.gif"> ! Information sur un ouvrage retrouvée
    ! Titre:
    *************** *** 153,237 ****     		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Information emprunteur
    ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ! ,
    /images/background-mem.gif" colspan=2> ! indicateurs
    >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Paiement
    > ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Item'); return false;">()
    !
    > ! ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;"> ! !
    !
    >
    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Exemplaires rendus
    Retour pour leCode barreTitreAuteurTypeEmprunteur
    > ! ! ! ! // ! ! ! ! Non emprunté ! > align=center> ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">>> align=center>> ! ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ! ! ! ! !
    ! --- 156,240 ----     		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Informations Emprunteur
    ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Lecteur'); return false;"> ! ,
    /images/background-mem.gif" colspan=2> ! Drapeaux
    >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Payment
    > ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Ouvrage'); return false;">()
    !
    > ! ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;"> ! !
    !
    >
    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Ouvrages rendus
    Date de retourCode barreTitreAuteurSaisirEmprunteur
    > ! ! ! ! // ! ! ! ! Pas en prêt. ! >> ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;">>>>> ! ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Lecteur'); return false;"> ! ! ! ! !
    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes about-bottom.inc,1.2,1.3 about-top.inc,1.3,1.4 acquisitions-bottom.inc,1.4,1.5 acquisitions-top.inc,1.8,1.9 cat-bottom.inc,1.4,1.5 cat-top.inc,1.12,1.13 circulation-bottom.inc,1.4,1.5 circulation-top.inc,1.11,1.12 common-style.css,1.4,1.5 issues-bottom.inc,1.4,1.5 issues-top.inc,1.3,1.4 members-bottom.inc,1.4,1.5 members-top.inc,1.10,1.11 opac-bottom.inc,1.3,1.4 opac-top.inc,1.3,1.4 parameters-bottom.inc,1.4,1.5 parameters-top.inc,1.10,1.11 reports-bottom.inc,1.4,1.5 reports-top.inc,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/includes Modified Files: about-bottom.inc about-top.inc acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-top.inc circulation-bottom.inc circulation-top.inc common-style.css issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc opac-bottom.inc opac-top.inc parameters-bottom.inc parameters-top.inc reports-bottom.inc reports-top.inc Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** about-bottom.inc 18 Sep 2003 12:32:40 -0000 1.2 --- about-bottom.inc 11 Feb 2004 09:00:20 -0000 1.3 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** about-top.inc 5 Jun 2003 12:40:49 -0000 1.3 --- about-top.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 3,11 **** ! KOHA: INTRANET: Parameters ! /includes/common-style.css"> ! --- 3,11 ---- ! KOHA: INTRANET: Paramètres ! /includes/common-style.css"> ! *************** *** 33,37 ****
    !
    --- 33,37 ----
    !
    *************** *** 50,54 **** ! Acquisition --- 50,54 ---- ! Acquisitions *************** *** 56,63 **** ! Etats ! Paramètres --- 56,63 ---- ! Rapports ! Paramètres *************** *** 72,78 ****
    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    !     --- 72,78 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** acquisitions-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- acquisitions-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 1,18 **** - -

     

    Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide
    --- 1,19 ----

     

    + +
    Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help
    *************** *** 20,22 **** - --- 21,22 ---- Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** acquisitions-top.inc 5 Jun 2003 12:40:49 -0000 1.8 --- acquisitions-top.inc 11 Feb 2004 09:00:20 -0000 1.9 *************** *** 4,8 **** KOHA: INTRANET: Acquisitions ! /includes/common-style.css"> KOHA: INTRANET: Acquisitions ! /includes/common-style.css">     		! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 70,76 ****

    ! !

    Connecté en tant que : [Quitter]

    ! !

    Se connecter à Koha

    !     --- 70,76 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** cat-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- cat-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** cat-top.inc 7 Aug 2003 14:19:55 -0000 1.12 --- cat-top.inc 11 Feb 2004 09:00:20 -0000 1.13 *************** *** 14,18 **** ! /includes/common-style.css"> !
    ! --- 60,83 ----
    --- 25,35 ---- font-weight: bold; } !
    ! !
    *************** *** 151,155 **** ! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 157,164 **** ! Marc ! ! Etats --- 54,58 ---- ! Rapports *************** *** 166,174 **** ! A propos
    		! A propos
    + + + + + + + + +
    options >>   + Adresse Lecteur + + Ajouter un lecteur + + Ajouter une organisation +
    ! !

    Connecté en tant que : [Log Out]

    ! !

    Se connecter à Koha

    !     --- 85,91 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: opac-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-bottom.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-bottom.inc 18 Sep 2003 12:32:40 -0000 1.3 --- opac-bottom.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 7,12 **** ! Recherche || ! Zone Lecteur || Accueil --- 7,13 ---- ! Recherche Catalogue || ! ! S'inscrire || Accueil Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-top.inc 5 May 2003 15:00:54 -0000 1.3 --- opac-top.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 4,8 **** ! KOHA: OPAC Catalogue Search --- 4,8 ---- ! KOHA: OPAC Recherche Catalogue *************** *** 28,58 ****
    KOHA: Catalogue SearchSearch ! ! My Settings ! ! Join ! Home
    /images/inside-top-search.gif" ! width=349 height=50 alt="KOHA: Recherche Catalogue" hspace=0 vspace=0 border=0>/images/mouseover-search.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-search.gif" ! width=71 height=30 alt="Chercher" hspace=0 vspace=0 border=0 name="menu-search"> ! /images/mouseover-mysettings.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'"> ! /images/menu-mysettings.gif" width=90 height=30 alt="My Settings" hspace=0 vspace=0 border=0 name="menu-mysettings"> ! /images/mouseover-join.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'"> ! /images/menu-join.gif" width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"> ! /images/mouseover-home.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-home.gif" ! width=60 height=30 alt="Accueil" hspace=0 vspace=0 border=0 name="menu-home">
    KOHA
    /images/inside-koha-bottom.gif" width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 >/images/holder.gif" width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" > !
    --- 31,35 ----
    !
    *************** *** 48,52 **** ! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 73,77 **** ! Valeurs auth --- 73,77 ---- ! Valeur autorisée *************** *** 91,97 ****
    ! !

    Connecté en tant que: [Déconnecter]

    ! !

    Se connecter à Koha

    !     --- 91,97 ----
    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** reports-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- reports-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Paramètres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Paramètres || ! A propos || ! Help Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** reports-top.inc 5 Jun 2003 12:40:49 -0000 1.9 --- reports-top.inc 11 Feb 2004 09:00:20 -0000 1.10 *************** *** 3,8 **** ! KOHA: INTRANET: Reports ! /includes/common-style.css"> ! KOHA: INTRANET: Rapports ! /includes/common-style.css">
    		! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 70,76 ****
    ! !

    Connecté en tant que: [Déconnecter]

    ! !

    Se connecter à Koha

    !     --- 70,76 ----

    ! !

    Connecté comme: [Déconnecter]

    ! !

    S'identifier à Koha

    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio-nomarc.tmpl,1.1,1.2 additem-nomarc.tmpl,1.1,1.2 marcimport.tmpl,1.2,1.3 addbiblio.tmpl,1.10,1.11 addbooks.tmpl,1.3,1.4 isbnsearch.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: addbiblio.tmpl addbooks.tmpl isbnsearch.tmpl Added Files: addbiblio-nomarc.tmpl additem-nomarc.tmpl marcimport.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** addbiblio.tmpl 24 Nov 2003 16:28:49 -0000 1.10 --- addbiblio.tmpl 11 Feb 2004 09:00:21 -0000 1.11 *************** *** 1,15 **** ! !
    ! /images/background-mem.gif"> ! --- 1,15 ---- ! !
    Notice MARC :
    ! /images/background-mem.gif"> ! *************** *** 17,35 ****
    Notice biblio MARC :
    ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 ! "> ! ! recherche z3950
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 40,63 ****
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 ! "> ! ! ! ! ! ! Recherche Z39.50
    ! ! ! /images/background-mem.gif"> ! ! ! !
    ">"> - )">+
      * ! ! "> ! "> ! "> ! "> ! ">
    --- 44,78 ----
    ! ! ! /images/background-mem.gif"> ! ! ! ! + + + + +
    ">"> - )">+
      * ! ! "> ! "> ! "> ! "> ! ">
    +   + + +
    >>>>
    +     +
    *************** *** 65,88 **** --- 80,115 ---- *************** *** 90,113 **** --- 117,152 ---- *************** *** 115,138 **** --- 154,189 ---- *************** *** 140,163 **** --- 191,226 ---- *************** *** 165,188 **** --- 228,263 ---- *************** *** 190,213 **** --- 265,300 ---- *************** *** 215,238 **** --- 302,337 ---- *************** *** 240,263 **** --- 339,374 ---- *************** *** 265,288 **** --- 376,404 ---- *************** *** 290,323 **** ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> !
    --- 406,439 ---- ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! *************** *** 328,336 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 444,452 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 357,361 **** if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) { // We should not flag an error unless the tag is also ! // mandatory, or if something else in the tag is entered if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) { --- 473,477 ---- if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) { // We should not flag an error unless the tag is also ! // mandatory, ou if something else in the tag is entered if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) { *************** *** 385,400 **** var alertString2; if (total_errors!=0) { ! alertString2 = "Saisie invalide pour les raisons suivantes :\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; ! alertString2 += "- "+ total_missing_mandatory_tags +" zones obligatoires vides\n"; ! alertString2 += "- "+ total_missing_mandatory_subfields +" sous-zones obligatoires vides (voir sous-zones en gras)"; alert(alertString2); } else { ! document.f.submit(); } } function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=600,height=400,toolbar=false,scrollbars=yes'); } --- 501,516 ---- var alertString2; if (total_errors!=0) { ! alertString2 = "Form not submitted because sur the following problem(s)\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; ! alertString2 += "- "+ total_missing_mandatory_tags +" mandatory tags empty\n"; ! alertString2 += "- "+ total_missing_mandatory_subfields +" mandatory fields empty (see bold subfields)"; alert(alertString2); } else { ! document.forms[0].submit(); } } function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=oui'); } *************** *** 415,420 **** } } ! newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes'); } function AddField(field) { document.forms[0].op.value = "addfield"; --- 531,537 ---- } } ! newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=oui'); } + function AddField(field) { document.forms[0].op.value = "addfield"; Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** addbooks.tmpl 3 Sep 2003 11:58:47 -0000 1.3 --- addbooks.tmpl 11 Feb 2004 09:00:21 -0000 1.4 *************** *** 1,18 **** ! ! Import et saisie de notices !

    ! Pas d'exemplaires ! !

    ! Site web ajouté !

    !
    Pour ajouter une nouvelle notice, scanner le code barre ou saisir l'ISBN/ISSN/titre de l'ouvrage
    --- 1,18 ---- ! ! Gérer une notice biblio MARC !

    ! Pas d'ouvrages trouvés ! !

    ! Notice site Web ajoutée !

    !
    Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN.:
    *************** *** 22,29 **** ISBN: ! ! Si l'ouvrage est trouvé dans la table des notices actives, il sera rappelé et pourra être modifié.
    ! Si l'ouvrage est trouvé dans le réservoir, il pourra être appelé pour la saisie d'une nouvelle notice active.
    ! Sinon, il est possible de créer une notice à partir de 0 Titre --- 22,29 ---- ISBN: ! ! Si l'ISBN ou le titre est trouvé dans la table biblio, il sera récupéré et peut être modifié.
    ! Si l'ISBN ou le titre existe déjà dans le réservoir, il va être récupéré et une notice biblio sera ajoutée.
    ! Sinon, une notice biblio peut être créée manuellement. Titre *************** *** 31,39 ****   ! ! Créer une notice vide ! ! Créer une notice vide ! --- 31,39 ----   ! ! Créer une notice biblio vide ! ! Créer une notice biblio vide ! *************** *** 44,48 **** !
    Ajout d'un site web
    --- 44,48 ---- !
    Ajouter un nouveau site Web
    *************** *** 50,59 **** ! !
    mot-clef:

    ! --- 50,59 ---- ! !
    Mot-clé:

    ! Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** isbnsearch.tmpl 1 Apr 2003 13:46:43 -0000 1.2 --- isbnsearch.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,55 **** ! ! ! Résultats recherche de notices

    ! Votre recherche : ISBN , résultats trouvés
    ! Affichage des résultats à ! réponses
    ! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! !

    ! ! ! ! ! ! ! ! ! ! "> ! ! ! -
    TitreAuteurAnnée 
    ! ">Editer...
    !

    !
    Notices dans le réservoir
    --- 1,63 ---- ! ! Résultats de recherche Biblio

    ! Recherche effectuée sur ISBN title
    ! ! Résultats trouvés
    ! Résultats to affiché !

    ! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! !
    Notices bibliographiques dans Koha
    ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteur© 
    ! ">Ajouter items">Editer...
    Rien trouvé

    !
    Notices bibliographiques dans le réservoir
    *************** *** 59,75 **** Auteur ISBN ! vient de     ! ! "> ! ! ! ! ! ">créer notice !   --- 67,91 ---- Auteur ISBN ! provenant de     ! ! ! "> ! ! ! ! ! ! ! ! ">Ajouter une notice biblio ! ! ! ! Rien trouvé !   *************** *** 77,83 ****     ! ">Créer notice vierge ! --- 93,104 ----     ! ! ">Ajouter New Biblio ! ! ">Ajouter New Biblio ! !
    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detailprint.tmpl,1.1,1.2 catalogue-home.tmpl,1.5,1.6 cmsdsearchresults.tmpl,1.1,1.2 detail-opac.tmpl,1.1,1.2 detail.tmpl,1.6,1.7 MARCdetail.tmpl,1.7,1.8 moredetail.tmpl,1.4,1.5 searchresults.tmpl,1.2,1.3 subject.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Added Files: detailprint.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** catalogue-home.tmpl 18 Sep 2003 13:28:58 -0000 1.5 --- catalogue-home.tmpl 11 Feb 2004 09:00:21 -0000 1.6 *************** *** 1,12 **** ! ! ! ! !

    ! Recherche Catalogue
    --- 1,12 ---- ! ! ! ! ! !

    Recherche Catalogue

    *************** *** 14,29 **** ! ! ! - ! --- 14,31 ----
    Code barre exemplaires     OU
     
    ! Note :Utiliser un plus grand nombre de champs pour votre recherche (par ex. Mots-clés + auteur + cote) ralentira la recherche.

    ! ! ! ! *************** *** 33,45 **** !
    Code barre     OU
     
    ! AIDE
    ! Chercher :L'utilisation de plusieurs critères pour votre recherche ralentit le système.

    ! ! --- 35,49 ---- !
    Mots-clés
    Titre ! Normal ! Exacte
    ! ! ! ! *************** *** 52,101 **** ! ! ! ! ! ! ! - ! ! !
    Mots-clés
    Titre ! Normal ! Exact
    Dewey
    Cote
    OU
    Sujet
    ! ! ! !
    ! !

    ! Etagères virtuelles !

    ! --- 56,110 ---- ! ! Dewey ! Catégorie ! ! OU ! Sujet ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! Rayonnages virtuels !
    ! !

    !

    Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cmsdsearchresults.tmpl 3 Feb 2003 11:12:14 -0000 1.1 --- cmsdsearchresults.tmpl 11 Feb 2004 09:00:21 -0000 1.2 *************** *** 1,27 **** ! Résultats de la recherche ! ! ! ! ! !
    TitreAuteurDewey
    ! &startfrom=>Résultats précédents ! &startfrom=>Résultats suivants
    !
    Résultats à sur enregistrements.
    --- 1,28 ---- ! Résultats de recherche ! ! ! ! ! !
    TitreAuteurDewey
    ! &startfrom=>Previous Records ! &startfrom=>Next Records
    !
    ! Résultats à sur enregistrements.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail-opac.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail-opac.tmpl 3 Feb 2003 11:12:14 -0000 1.1 --- detail-opac.tmpl 11 Feb 2004 09:00:21 -0000 1.2 *************** *** 1,23 **** ! - -

    Connecté: [Déconnexion]

    - -

    Se connecter à Koha

    -     ! ! ! () !

    ! --- 1,17 ---- ! ! ! () !

    ! NOTICE !
    ! *************** *** 26,74 ****
    ! Sous-titre:
    ! Auteur:
    ! Autre auteur:
    ! Collection:
    ! Sujet:
    ! Date de publi.:
    ! Notes:
    ! Unititle:
    ! Pério.:
    ! Nombre d'ex.:

    ! Notice bibliographique !
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type de doc.Cote LocalisationRetour leDernière transaction
    Site webdisponibleen ligne &bib=&bi=">http://

    --- 20,68 ----
    ! Sous-titre:
    ! Auteur:
    ! Auteur supplémentaire:
    ! Titre Séries:
    ! Sujet:
    ! Copyright:
    ! Notes:
    ! Titre uniforme:
    ! Périodiques:
    ! Nombre total d'ouvrages:

    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catég ouvrageCatégorie LocalisationDate de retourVu
    Site WebEn ligneDisponible &bib=&bi=">http://

    *************** *** 78,80 ****

    ! --- 72,74 ----

    ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** detail.tmpl 14 Oct 2003 11:37:48 -0000 1.6 --- detail.tmpl 11 Feb 2004 09:00:21 -0000 1.7 *************** *** 1,114 **** ! ! ! ! ! !

    () ! ! ! ! class="button">Réservations ! !

    ! ! !
    ! Notice N°
    !
    " class="button">MARC

    ! Sous-titre: ! Auteur: >
    ! Autre Auteur:
     ! Publié par : ! en ! , ! ,
    ! Collection:
    ! Sujet:
    ! Année:
    ! Notes:
    ! Titre uniforme:
    ! Périodique:
    ! Côte dewey :
    ! URL :
    ! Nbre total d'exemplaires: !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type de documentCoteLocalisationRetour prévuDernière transactionCode-barresVolume
    >&item=&bi=">&item=>Fix Itemtype
    Site webdisponibleen ligne&bib=&bi=">http://

    - - - -

    HELP
    - Mettre à jour la notice pour tous les exemplaires: cliquez sur le bouton Modifier - [à gauche] pour modifier la notice. Tout changement sera répercuté sur la notice de tous les exemplaires ci-dessus.

    - Mettre à jour la notice pour UN ou QUELQUES exemplaires: - Si certains exemplaires ci-dessus doivent avoir une notice différente, ou sont liés à la mauvaise notice, vous devez utiliser le module - acquisitions. Vous devrez "re-commander" les exemplaires, et les effacer de cette notice. -


    --- 1,99 ---- ! ! ! ! ! ! ! ! !
    ! >Requests !
    ! ! () !

    ! ! !
    ! Notice bibliographique
    !
    " class="button">MARC

    ! ISBN:">
    ! Sous-titre:
    ! Auteur: ">
    ! Auteur supplémentaire:
    ! Publié par : ! en ! , ! ,
    ! Collection:
    ! Sujet:
    ! Année :
    ! Notes:
    ! Titre uniforme:
    ! Périodiques:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Nombre total d'ouvrages:
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catég ouvrageLocalisationDate de retourVuCode barreVolume
    &item=&bib=&bi="> ! &item=>Fix Itemtype !
    Site WebEn ligneDisponible ! &bib=&bi=">http:// !


    *************** *** 119,128 **** Résumé ! ! ! --- 104,113 ---- Résumé ! ! ! *************** *** 130,147 **** ! ! ! !
    Liens vers des sites web associés
    Titre:
    ! Description:
    ! URL:">http://
    --> ! --- 115,133 ---- ! ! ! !
    Links to ! Associated Websites
    Titre:
    ! Description:
    ! URL:">http://
    --> ! Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** MARCdetail.tmpl 6 Nov 2003 17:18:30 -0000 1.7 --- MARCdetail.tmpl 11 Feb 2004 09:00:21 -0000 1.8 *************** *** 1,3 **** ! --- 1,10 ---- ! ! !
    *************** *** 5,16 ****
    ! /images/background-mem.gif"> !
    ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">NormalMARC biblio :
    --- 12,24 ----     		! /images/background-mem.gif"> !
    ! ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">ImprimerNotice biblio MARC :
    *************** *** 31,35 ****
    8
    9
    Exemplaire
    --- 39,43 ----
    8
    9
    Ouvrage
    *************** *** 39,62 ****     		! ! ! class="button">Réservations !
    -
    ! ! /images/background-mem.gif"> ! ! ! ! ! --- 47,69 ----
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! ! class="button">Réservation !
    ! ! /images/background-mem.gif"> ! ! ! ! ! *************** *** 67,82 ****
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! ! !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    --- 74,89 ---- *************** *** 84,99 **** --- 91,106 ---- *************** *** 101,116 **** --- 108,123 ---- *************** *** 118,133 **** --- 125,140 ---- *************** *** 135,150 **** --- 142,157 ---- *************** *** 152,167 **** --- 159,174 ---- *************** *** 169,184 **** --- 176,191 ---- *************** *** 186,201 **** --- 193,208 ---- *************** *** 203,218 **** --- 210,225 ---- *************** *** 220,231 **** --- 227,238 ---- *************** *** 240,244 **** document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 247,251 ---- document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 251,257 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** moredetail.tmpl 12 Sep 2003 13:26:59 -0000 1.4 --- moredetail.tmpl 11 Feb 2004 09:00:21 -0000 1.5 *************** *** 1,49 **** !

    !
    ! >Réservations

    &type=intra> ! ()

    ! > ! > ! --- 1,49 ---- !

    !
    /images/background-mem.gif" ! > GROUPE -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! numéro de notice:
    ! Type de document:
    ! URL :
    ! Durée de prêt :
    ! Coût du prêt :
    ! Cote :
    ! ISBN:
    ! Editeur :
    ! Lieu :
    ! Date:
    ! Volume :
    ! Pages :
    ! Ill :
    ! Taille :
    ! Notes :
    ! Nbre d'exemplaires :
    ! >Requests

    &type=intra> ! ()

    ! > ! > ! *************** *** 51,95 ****
    /images/background-mem.gif" ! > GROUP -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Biblionumber:
    ! Catég ouvrage:
    ! URL:
    ! Durée de prêt:
    ! Coût du prêt:
    ! Classification:
    ! ISBN:
    ! Editeur:
    ! Lieu:
    ! Date:
    ! Volume:
    ! Pages:
    ! Ill.:
    ! Taille:
    ! Notes:
    ! Nombre d'ouvrages:

    !     ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">CODE-BARRES !
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Localisation d'origine :
    ! Dernière transaction :
    ! Dernier emprunt :
    ! ! Dernier emprunteur 1 :
    ! Last Borrower 2 :
    ! Localisation actuelle :
    ! Prix de remplacement :
    ! Exemplaire perdu :
    ! Payé :
    ! Notes:
    ! Prolongations :
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Cancelled:
    &bi=&itm=> ! Nbre total de prets :
    ! Numéro de groupe :
    ! Numéro de notice :
    --- 51,95 ----
    ! ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">CODE BARRE !
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Annexe propriétaire:
    ! Vu:
    ! Dernier prêt:
    ! ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Prix Remplacement:
    ! Ouvrage perdu:
    ! Payé pour:
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=oui"> Accession ! Date:
    ! Annulé:
    &bi=&itm=>Total ! Prêts:
    ! N° Groupe:
    ! N° Biblio:
    *************** *** 100,104 ****
    !

    --- 100,104 ---- !

    *************** *** 106,108 ****

    ! --- 106,108 ----
    ! Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** searchresults.tmpl 4 Sep 2003 16:01:02 -0000 1.2 --- searchresults.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,114 **** ! ! ! ! !
    - -

    Connecté: [Déconnexion]

    - -

    Se connecter à Koha

    -     ! ! Votre recherche : ! ! Vous n'avez spécifié aucun critère de recherche
    !     ! ! résultats trouvés

    ! ! ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! !

    ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    TitreAuteurAnnéeNbre d'exemplairesLocalisation 
    ?type=opacintra&bib=>&type=opacintra> >Réservation
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Résultats précédents ! !   ! ! ! ! &=&type=opacintra>Résultats suivants ! !   ! !
    !
    ! !
    ! Résultats à sur enregistrements. !

    ! ! Essayez une nouvelle recherche ! ! ! Essayez une nouvelle recherche ! ! ! ! ! ! ! ! --- 1,101 ---- ! ! ! ! !
    + + Recherche effectuée sur + + Vous n'avez pas spécifié de critère
    + ! Résultats trouvés

    + + + &=&type=opacintra>/images/numbers/prev.gif border=0> + + /images/numbers/placeholder.gif border=0> + + + + /images/numbers/-highlight.gif> + + &=&type=opacintra>/images/numbers/.gif border=0> + + + + &=&type=opacintra>/images/numbers/next.gif border=0> + + /images/numbers/placeholder.gif border=0> + !

    ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
    TitreAuteur©Nombre d'ouvragesLocalisation 
    ?type=opacintra&bib=>&type=opacintra> >Réservation
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! ! !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! ! &=&type=opacintra>Next Records ! !   ! !
    !
    ! !
    ! Résultats à sur enregistrements. !

    ! ! Essayer une autre recherche ! ! ! Essayer une autre recherche ! ! ! ! ! ! ! ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** subject.tmpl 1 Apr 2003 13:50:05 -0000 1.2 --- subject.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,41 **** ! ! ! ! ! ! ! !

    Connecté: [Déconnexion]

    ! !

    Se connecter à Koha

    !
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Sujet
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Résultats précédents ! ! &startfrom=>Résultats suivants !
    !

    ! Résultats à sur résultats.
    ! ! ! ! ! --- 1,51 ---- ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sujet
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Résultats à sur enregistrements.
    ! ! ! ! ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.3,1.4 acquire.tmpl,1.1,1.2 basket.tmpl,1.5,1.6 newbasket2.tmpl,1.4,1.5 newbasket.tmpl,1.1,1.2 newbiblio.tmpl,1.5,1.6 order.tmpl,1.3,1.4 recieveorder.tmpl,1.1,1.2 recieve.tmpl,1.1,1.2 supplier.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27625/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieveorder.tmpl recieve.tmpl supplier.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** acqui-home.tmpl 22 Sep 2003 13:04:48 -0000 1.3 --- acqui-home.tmpl 11 Feb 2004 09:00:47 -0000 1.4 *************** *** 1,14 **** ! ! Acquisitions
    ! !
    ! Débuter, réceptionner, modifier une commande
    N° ou nom du vendeur
    --- 1,14 ---- ! !

    Acquisitions


    ! !
    ! COMMENCER, RECEVOIR, MODIFIER UNE COMMANDE
    Nom du fournisseur *************** *** 18,96 ****
    !
    ! ! ! ! ! -
    Budgets
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    BudgetsTotalDépenséEngagéDispo
    Total

    ! Utiliser la fonction "mise à jour" (ctrl-r) pour mettre à jour les valeurs. ! Les montants engagés sont approximatifs, ils varient en fonction des taux de change.
    ! ! ! ! !
    Taux de change
    ! ! " value=>

    ! Aide
    ! Commande:

    Pour débuter une acquisition, chercher tout d'abord le vendeur. Vous pourrez ensuite créer un nouveau "panier".

    !

    Pour commander un exemplaire, vous devez vérifier qu'une notice existe déjà, et soit ajouter un exemplaire, soit créer une nouvelle notice et y ajouter un exemplaire

    !

    Pour commencer un nouveau panier avec un nouveau fournisseur, revenez à cette page, et passez par la recherche d'un fournisseur

    !

    Pour cloturer un panier, cliquer sur "voir panier", et choisir "confirmer panier"
    ! --- 18,115 ----
    ! ! ! !
    ! RECEPTIONNE OU MODIFIE UNE COMMANDE PERIODIQUE !
    Recherche Titre !
    ! !
    + +
    + ! ! ! ! !
    TAUX DE CHANGE
    ! ! " value=>
    + + + + + + + + + + +
    BUDGETS ET COMPTES
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Budgets TotalDépenséEngagéDisp.
    Total
    +

    + Rafraichissez la page pour avoir les derniers chiffres. Les montants engagés sont approximatifs, car les taux de change peuvent modifier le montant effectivement payé. +

    +
    +
    !

    AIDE commande:

    !
      Pour faire une acquisition, soit par commande, par achat direct ou par un don, commencer par rechercher le fournisseur. Ajoutez-en un si nécessaire.
    !
      Sélectionnez ensuite un panier ou créez-en un nouveau. Note: le panier sera rattaché à cet utilisateur
    !
      Pour commander un ouvrage, une notice biblio doit exister pour l'ajouter ou alors il faut d'abord créer une nouvelle notice biblio avant de l'ajouter.
    !

    Pour quittez un panier, cliquez sur "Voir les paniers" ou Recherche ci-dessus, puis cliquez sur "Confirmer le panier".
    ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquire.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- acquire.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,14 **** !
    ! Facture :
    ! Réceptionnée par :
    !
    ! Réception pour : facture,
    !
    ! - Receive Order
    ! Panier pour : !
    Commande passée le :

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 25,73 ---- !

    - Recevoir Commande


    ! Panier pour: !
    Commande envoyée:

    /images/background-mem.gif" colspan=2> ! Détail catalogue
    Titre *" >
    Auteur" >
    Copyright" >
    Format
    ISBN">
    titre périodique">
    Site
    code barre exemplaire *">
    ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 77,91 **** --- 77,91 ---- *************** *** 93,134 ****
    /images/background-mem.gif" colspan=2> ! DETAILS CATALOGUE
    Titre *" >
    Auteur" >
    Date Copyright" >
    Format
    ISBN">
    Séries">
    Annexe
    Code barre d'un ouvrage *">
    ! > ! > ! > ! "> ! "> ! "> ! ! /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> ! ! &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0> !
    ! > ! > ! > ! "> ! "> ! "> ! ! ! ! &id=>Editer !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>Détails financiers
    Fonds *
    Quantité commandée">
    Quantité Reçue *">
    Cout remplacement">
    cout budgété">
    Cout réel *">
    Facture N° ! ! ">
    Notes">
    --- 93,134 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAILS COMPTABILITE
    Comptes *
    Quantité commandée">
    Quantité reçue *">
    Frais Remplacement">
    Coûts budgetés ">
    Coût effectif *">
    N° facture ! ! ">
    Notes">
    *************** *** 137,141 ****

     

    !
    --- 137,141 ----

     

    !
    *************** *** 144,162 **** Panier ISBN ! TITLE AUTEUR ! Qté Reçu ! ! ! ! &biblio=&invoice=&freight=&gst=&id=> ! ! ! ! ! --- 144,162 ---- Panier ISBN ! TITRE AUTEUR ! Quantité Reçu ! ! ! ! &biblio=&invoice=&freight=&gst=&id=> ! ! ! ! ! Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** basket.tmpl 17 Sep 2003 13:34:11 -0000 1.5 --- basket.tmpl 11 Feb 2004 09:00:47 -0000 1.6 *************** *** 1,57 **** ! ! Panier pour >
    ! (Référence: , #, passée par : )

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! ! ! --- 1,57 ---- ! !

    Panier pour >


    ! Notre ref: , # validée par

    N° cmde Isbn Titre AuteurPx remplPx estQtéRecuTotal
    &id=&basket=">
    AIDE
    ! Pour changer un élément de cataloguage ou de comptabilité attaché à une commande, cliquer sur le titre
    		Sous-Total>
    TVA>
    TOTAL>
    ! "> ! "> ! Ajouter commande : entrer mot clef ou titre de notice
    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! ! ! *************** *** 61,63 **** ! --- 61,63 ---- ! Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** newbasket2.tmpl 17 Sep 2003 13:34:11 -0000 1.4 --- newbasket2.tmpl 11 Feb 2004 09:00:47 -0000 1.5 *************** *** 1,76 **** ! !

    Panier pour:

    ! ! &basket=&sub="> ! //images/filenew.png" align=right alt="Ajouter Notice" border=0> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter Notice"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Voir Panier">
    ! > ! > ! Nouvelle Recherche:
    ! Votre recherche: ! ! !
    ! résultats. !
    Affichage des résultats à . !
    Commande Editeur Isbn Titre Auteur$ rrp$estQuantité Total
    &id=&basket=">
    AIDE
    ! Pour changer n'importe quelle information attachée à cette commande, cliquez sur le titre.
    		Sous-total
    GST
    TOTAL
    ! "> ! "> ! Ajouter une commande : entrez un mot-clé ou un titre:
    "> ! /images/background-mem.gif"> ! ! ! ! "> ! !
    TITRE AUTEURANNEENOMBRE LOCALISATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! &type="> ! ! ! !
      --- 1,76 ---- ! !

    Panier pour:

    ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter New Biblio"> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter New Biblio"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Voir Panier">
    ! > ! > ! Nouvelle recherche:

    ! Recherche effectuée sur ! ! !
    ! Résultats trouvés. !
    Résultats to affiché. ! ! ! ! ! ! "> ! !
    TITRE AUTEUR©COMPTE LOCALISATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! &type="> ! ! ! !
      *************** *** 91,100 ****
    ! ! &offset=&type=&id=&basket=&search=&author="> Next !
    ! --- 91,100 ----
    ! ! &offset=&type=&id=&basket=&search=&author="> Next !

    ! Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newbasket.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- newbasket.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,14 **** ! ! Panier for
    ! (Référence: , #, passée par : )
    ! Tel: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Chercher mot-clef ou titre:
    --- 1,14 ---- ! !

    Panier for


    ! (Notre ref: , #, validée par: )
    ! Tél.: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Rechercher Mot-clé ou Titre:
    *************** *** 16,36 **** ! ! ! ! > ! ! ! ! ! !
    N° cmde Isbn Titre AuteurQté
    ! --- 16,36 ---- ! ! ! ! > ! ! ! ! ! !
    Commande Isbn Titre AuteurQuantité
    ! Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** newbiblio.tmpl 17 Sep 2003 13:34:11 -0000 1.5 --- newbiblio.tmpl 11 Feb 2004 09:00:47 -0000 1.6 *************** *** 1,7 **** !
    ! ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! !
    ! - Détail commande
    ! Panier pour : !     		! "> ! //images/1uparrow.png" border=0 alt="View Basket"> ! !

    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAIL CATALOGUE
    Titre *">
    Auteur" >
    Date copyright">
    Catégorie
    ISBN">
    Périodiques">
    Site
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! ! ! --- 51,143 ---- ! ! --> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Voir Panier !

    - Commande Details


    ! Panier pour:

    /images/background-mem.gif" colspan=2>DETAILS FINANCIERS
    Quantité" onchange='update(this.form)' >
    Fonds
    Prix fournisseur" onchange='update(this.form)'>
    Coût remplacement
    		" onchange='update(this.form)'>
    Cout budgété
    		" onchange='update(this.form)'>
    Taxes
    TOTAL BUDGETE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAILS CATALOGUE
    Titre *">
    Auteur" >
    Editeur" >
    Date Copyright">
    Format
    ISBN">
    Séries">
    Annexe
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 153,160 **** ! !
    /images/background-mem.gif" colspan=2>DETAILS COMPTABILITE
    Quantité" onchange='mettre à jour(this.form)' >
    Comptes
    Prix catalogue du fournisseur" onchange='mettre à jour(this.form)'>
    Frais Remplacement
    		" onchange='mettre à jour(this.form)'>
    Coûts budgetés
    (ex TVA, remise)     		" onchange='mettre à jour(this.form)'>
    GST budgeté
    TOTAL BUDGETE
    Notes">
    //images/2rightarrow.png" border=0 align=right>
    --- 150,158 ---- Notes ! "> ! ! *************** *** 162,173 ****
    !
    /images/background-mem.gif">HELP
      !
    • les champs en GRAS doivent être remplis pour créer une nouvelle notice et un exemplaire
      • !
    • Les champs en italique peuvent être utilisés pour faire une "réception rapide" lorsque les exemplaires seront réceptionnés

     

    ! --- 160,171 ----
    !
    /images/background-mem.gif">AIDE
      !
    • Les champs en gras sont obligatoires.

      !

    • Les champs ombrés peuvent être utilisés pour effectuer un retour "rapide", quand les ouvrages ont été acheté localement ou reçus en don. Dans ce cas, la quantité "commandée" sera aussi affectée dans la base de données à la quantité "reçue".

     

    ! Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** order.tmpl 17 Sep 2003 13:34:11 -0000 1.3 --- order.tmpl 11 Feb 2004 09:00:47 -0000 1.4 *************** *** 1,17 **** ! ! Recherche fournisseur
    ! vous avez cherché le fournisseur , réponses trouvées

    ! ! ! ! ! ! ! ! ! !
    N° cmdeLivraisonfournisseur ! ! --- 1,17 ---- ! !

    Résultats de recherche fournisseur


    ! Recherche effectuée sur Fournisseur , Résultats trouvés

    PanierExemplaireSaisi par Date
    ! ! ! ! ! > ! !
    CommandeRecevoirEntreprise ! ! *************** *** 20,52 **** ! ! > ! ! ! !
    PanierOuvragesEquipe Date
    ! ">/images/mail_send.png" title="Passer commande" ALT="Add" BORDER=0 > ! ">/images/mail_get.png" title="Livraison" ALT="Add" BORDER=0 > "> ! ! ! ! !
    ">
    -

    ! Ajouter fournisseur !

    !
    ! --- 20,52 ----
    ! ! /images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 > ! ! Inactif ! ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > ! ! ! ! !
    ">
    !
    ! Ajouter un fournisseur ! Index: recieveorder.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** recieveorder.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- recieveorder.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,29 **** ! ! Réceptionner commande du fournisseur

    ! >

    ! ! ! ! ! --- 1,29 ---- ! !

    Réceptionner commandes d'un fournisseur ">

    ! >

    INFORMATIONS DE FACTURE FOURNISSEUR
    N° commande fournisseur
    gst
    Port
    /images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
    ! ! ! ! ! *************** *** 31,33 **** ! --- 31,33 ---- ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** recieve.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- recieve.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,19 **** !
    ! Facture :
    ! Réceptionnée par :
    !
    ! Réception pour : , Facture
    ! "> ! "> ! "> ! "> ! Rechercher ISBN or Titre:

    --- 1,19 ---- !

    ! Facture:
    ! Reçu par:
    !
    !

    Sommaire pour : Facture

    ! "> ! "> ! "> ! "> ! Rechercher ISBN ou Titre:

    *************** *** 27,47 ****

    ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    INFORMATION FACTURE FOURNISSEUR
    N° de facture de fournisseur
    GST
    Fret
    AUTEUR ACTUELPortQTE TOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    --- 27,47 ----     		AUTEUR ACTUELP&PQUANTITE TOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    *************** *** 52,73 ****     		SUBTOTALS$$
    AIDE !
    Le total en bas de la page doit être le même que sur la facture à quelques cents près.

    ! Quand vous avez terminé, enregistrez les modifications     		GST?
    TOTAL?
    --- 52,74 ----

    		SOUS-TOTAUX$$
    AIDE !
    ! Le total au fond de la page devrait correspondre à quelques centimes au total de la facture.

    ! Quand vous avez fini cette facture, sauvegardez les changements.

    		GST$
    TOTAL$
    Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** supplier.tmpl 17 Sep 2003 13:34:11 -0000 1.4 --- supplier.tmpl 11 Feb 2004 09:00:47 -0000 1.5 *************** *** 1,159 **** !

    ! > ! Modification :

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - - -
    DETAIL FOURNISSEUR
    Nom fournisseur">
    Adresse !
    Adresse siège
    Tel">
    Fax">
    site web">
    CONTACT
    Nom">
    fonction">
    Tel">
    Autre tel">
    Fax">
    E-mail">
    Notes
    ! ! ! ! ! ! ! ! ! ! ! !
    STATUT
    Le fournisseur estchecked>Actif ! checked>Inactif
    INFORMATIONS COMMANDE
    Publications
    Les prix sont en
    Les factures sont en
    GST ! checked>Oui ! checked>Non
    Prix incluent la TVA ! checked>Oui ! checked>Non
    Le prix des factures incluent la TVA ! checked>Oui ! checked>Non
    remise> %
    !
    ! --- 1,164 ---- !
    ! > ! ! !

    Mettre à jour:

    ! !

    Ajouter un fournisseur

    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DETAILS ENTREPRISE
    Nom Entreprise">
    Adresse postale !
    Adresse physique
    Téléphone">
    Fax">
    Site Web">
    DETAILS CONTACT
    Nom du contact">
    Position">
    Téléphone">
    Autre téléphone">
    Fax">
    E-mail">
    Notes
    ! ! ! ! Actif ! Inactif ! ! ! ! ! ! ! ! ! ! !
    STATUT ACTUEL
    Le fournisseur est ! ! Actif ! Inactif
    INFORMATION COMMANDES
    Edition
    Prix catalogue sont
    Prix facturés sont
    GST enregistré ! checked>Oui ! checked>Non
    Prix catalogue de l'ouvrage inclus le GST ! checked>Oui ! checked>Non
    Prix de la facture de l'ouvrage inclus le GST ! checked>Oui ! checked>Non
    Rabais> %
    !
    !
    /images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" class="button">
    ! From acli at users.sourceforge.net Mon Feb 16 23:50:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 14:50:52 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator text-extract2.pl,1.32,1.33 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25717 Modified Files: text-extract2.pl Log Message: Minor factoring of construction of warning messages. Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** text-extract2.pl 14 Feb 2004 09:50:11 -0000 1.32 --- text-extract2.pl 16 Feb 2004 22:50:34 -0000 1.33 *************** *** 81,89 **** ############################################################################### ! sub warn_pedantic ($$) { ! my($flag, $msg) = @_; ! warn "Warning$pedantic_tag: $msg\n" if $pedantic_p || !$$flag; if (!$pedantic_p) { ! warn "Warning$pedantic_tag: Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; $$flag = 1; } --- 81,113 ---- ############################################################################### ! use vars qw( $appName $input_abbr ); ! ! sub construct_warn_prefix ($$) { ! my($prefix, $lc) = @_; ! # Construct some short but should-be-still-useful versions ! # of this script's name and the input file's name ! my $appName = $& if !defined $appName && $0 =~ /[^\/]+$/; ! my $input_abbr = $& if !defined $input_abbr && $input =~ /[^\/]+$/; ! # FIXME: The line number is not accurate, but should be "close enough" ! # FIXME: This wording is worse than what was there, but it's wrong to ! # FIXME: hard-code this thing in each warn statement. Need improvement. ! return "$appName: $prefix: " . (defined $lc? "$input_abbr: line $lc: ": "$input_abbr: "); ! } ! ! sub warn_normal ($$) { ! my($msg, $lc) = @_; ! my $prefix = construct_warn_prefix('Warning', $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg"; ! } ! ! sub warn_pedantic ($$$) { ! my($msg, $lc, $flag) = @_; ! my $prefix = construct_warn_prefix("Warning$pedantic_tag", $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg" if $pedantic_p || !$$flag; if (!$pedantic_p) { ! $prefix = construct_warn_prefix("Warning$pedantic_tag", undef); ! warn $prefix."Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; $$flag = 1; } *************** *** 105,110 **** $s = $rest; if ($val =~ /$re_tmpl_include/os) { ! warn "Warning: TMPL_INCLUDE in attribute" ! . (defined $lc? " near line $lc": '') . ": $val_orig\n"; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc --- 129,133 ---- $s = $rest; if ($val =~ /$re_tmpl_include/os) { ! warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc *************** *** 112,124 **** my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic \$pedantic_tmpl_var_use_in_nonpedantic_mode_p, "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . (defined $lc? " near line $lc": '') . ": $val_orig" if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic \$pedantic_attribute_error_in_nonpedantic_mode_p, "Unquoted attribute contains character(s) that should be quoted" ! . (defined $lc? " near line $lc": '') . ": $val_orig" if $t =~ /[^-\.A-Za-z0-9]/s; } --- 135,149 ---- my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . ": $val_orig", ! $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic "Unquoted attribute contains character(s) that should be quoted" ! . ": $val_orig", ! $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p if $t =~ /[^-\.A-Za-z0-9]/s; } *************** *** 127,137 **** if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! warn "Error: Completely confused while extracting attributes" ! . (defined $lc? " near line $lc": '') . ": $1\n"; ! warn "Error: " . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; $fatal_p = 1; } else { ! warn "Warning: Strange attribute syntax" ! . (defined $lc? " near line $lc": '') . ": $s\n"; } } --- 152,162 ---- if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! my $prefix = construct_warn_prefix('Error: ', $lc); ! warn $prefix . "Completely confused while extracting attributes" ! . ": $1\n"; ! warn $prefix . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; $fatal_p = 1; } else { ! warn "Strange attribute syntax: $s\n", $lc; } } *************** *** 159,163 **** } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn "Warning: Unescaped < near line $lc_0: $it\n" if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; ! warn "Warning: SGML \"closed start tag\" notation near line $lc_0: $1<\n" if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; ! warn "Warning: Syntax error in comment at line $lc_0: $&\n"; $syntaxerror_p = 1; } --- 200,208 ---- ($kind, $it, $readahead) = (KIND_TAG, "$1>", $3); $ok_p = 1; ! warn "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; ! warn "Syntax error in comment: $&\n", $lc_0; $syntaxerror_p = 1; } *************** *** 205,209 **** } } ! warn "Warning: Unrecognizable token found near line $lc_0: $it\n" if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): --- 230,234 ---- } } ! warn "Unrecognizable token found: $it\n", $lc_0 if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): *************** *** 352,356 **** } ! warn "Warning: This input will not work with Mozilla standards-compliant mode\n" if $syntaxerror_p; --- 377,381 ---- } ! warn "This input will not work with Mozilla standards-compliant mode\n", undef if $syntaxerror_p; From acli at users.sourceforge.net Tue Feb 17 00:42:59 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:42:59 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,NONE,1.1 VerboseWarnings.pm,NONE,1.1 text-extract2.pl,1.33,1.34 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4517 Modified Files: text-extract2.pl Added Files: TmplTokenizer.pm VerboseWarnings.pm Log Message: Pulled the tokenizer out into a module. Hope this has been done right. --- NEW FILE --- package TmplTokenizer; use strict; use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic ); require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplTokenizer.pm - Simple-minded tokenizer for HTML::Template .tmpl files =head1 DESCRIPTION Because .tmpl files contains HTML::Template directives that tend to confuse real parsers (e.g., HTML::Parse), it might be better to create a customized scanner to scan the template files for tokens. This module is a simple-minded attempt at such a scanner. =head1 HISTORY This tokenizer is mostly based on Ambrose's hideous Perl script known as subst.pl. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw( &KIND_TEXT &KIND_CDATA &KIND_TAG &KIND_DECL &KIND_PI &KIND_DIRECTIVE &KIND_COMMENT &KIND_UNKNOWN ); use vars qw( $input ); use vars qw( $debug_dump_only_p ); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); use vars qw( $fatal_p ); ############################################################################### # Hideous stuff use vars qw( $re_directive $re_tmpl_var $re_tmpl_var_escaped $re_tmpl_include ); use vars qw( $re_directive_control $re_tmpl_endif_endloop ); BEGIN { # $re_directive must not do any backreferences $re_directive = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:VAR|LOOP|INCLUDE|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # TMPL_VAR or TMPL_INCLUDE $re_tmpl_var = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; $re_tmpl_include = q{<(?:(?i)(?:!--\s*)?TMPL_(?:INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # TMPL_VAR ESCAPE=1/HTML/URL $re_tmpl_var_escaped = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR|INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))\s+ESCAPE=(?:1|HTML|URL)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # Any control flow directive $re_directive_control = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:LOOP|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # /LOOP or /IF or /UNLESS $re_tmpl_endif_endloop = q{<(?:(?i)(?:!--\s*)?\/TMPL_(?:LOOP|IF|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; } # Hideous stuff from subst.pl, slightly modified to use the above hideous stuff # Note: The $re_tag's set $1 (), and $3 (rest of string) use vars qw( $re_comment $re_entity_name $re_end_entity $re_etag ); use vars qw( $re_tag_strict $re_tag_compat @re_tag ); sub re_tag ($) { my($compat) = @_; my $etag = $compat? '>': '<>\/'; # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; } BEGIN { $re_comment = '(?:--(?:[^-]|-[^-])*--)'; $re_entity_name = '(?:[^&%#;<>\s]+)'; # NOTE: not really correct SGML $re_end_entity = '(?:;|$|(?=\s))'; # semicolon or before-whitespace $re_etag = q{(?:<\/?(?:"[^"]*"|'[^']*'|[^"'>\/])*[>\/])}; # end-tag @re_tag = ($re_tag_strict, $re_tag_compat) = (re_tag(0), re_tag(1)); } # End of the hideous stuff sub KIND_TEXT () { 'TEXT' } sub KIND_CDATA () { 'CDATA' } sub KIND_TAG () { 'TAG' } sub KIND_DECL () { 'DECL' } sub KIND_PI () { 'PI' } sub KIND_DIRECTIVE () { 'HTML::Template' } sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment sub KIND_UNKNOWN () { 'ERROR' } use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); ############################################################################### # Easy accessors sub fatal_p () { return $fatal_p; } sub syntaxerror_p () { return $syntaxerror_p; } ############################################################################### sub extract_attributes ($;$) { my($s, $lc) = @_; my %attr; $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { my($key, $val, $val_orig, $rest) = ($1, (defined $3? $3: defined $4? $4: $5), $2, $'); $i += 1; $attr{+lc($key)} = [$key, $val, $val_orig, $i]; $s = $rest; if ($val =~ /$re_tmpl_include/os) { warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc # XXX: there's just no reasonable thing to suggest my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; warn_pedantic "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" . ": $val_orig", $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p if defined $suggest && (pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; warn_pedantic "Unquoted attribute contains character(s) that should be quoted" . ": $val_orig", $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p if $t =~ /[^-\.A-Za-z0-9]/s; } } my $s2 = $s; $s2 =~ s/$re_tmpl_endif_endloop//g; # for the next check if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); $fatal_p = 1; } else { warn_normal "Strange attribute syntax: $s\n", $lc; } } return \%attr; } sub next_token_internal (*) { my($h) = @_; my($it, $kind); my $eof_p = 0; if (!defined $readahead || !length $readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; $readahead .= $next; } } $lc_0 = $lc; # remember line number of first line if ($eof_p && !length $readahead) { # nothing left to do ; } elsif ($readahead =~ /^\s+/s) { # whitespace ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); warn_normal "Warning: Unescaped < $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; $syntaxerror_p = 1; } last if $ok_p; my $next = scalar <$h>; $eof_p = !defined $next; last if $eof_p; $lc += 1; $readahead .= $next; } if ($kind ne KIND_TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { $kind = KIND_PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { $kind = KIND_DIRECTIVE; } if (!$ok_p && $eof_p) { ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): [$kind, $it]): undef; } sub next_token (*) { my($h) = @_; my $it; if (!$cdata_mode_p) { $it = next_token_internal($h); if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ($cdata_mode_p, $cdata_close) = (1, "") if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME push @$it, extract_attributes($it->[1], $lc_0); #FIXME } } else { for ($it = '';;) { my $lc_prev = $lc; my $next = next_token_internal($h); last if !defined $next; if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME $cdata_mode_p = 0; } last unless $cdata_mode_p; $it .= $next->[1]; #FIXME } $it = [KIND_CDATA, $it]; #FIXME $cdata_close = undef; } return defined $it? (wantarray? @$it: $it): undef; } ############################################################################### sub debug_dump (*) { # for testing only my($h) = @_; print "re_tag_compat is /$re_tag_compat/\n"; for (;;) { my $s = next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); my($kind, $t, $attr) = @$s; # FIXME printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); if ($kind eq KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { my($key, $val, $val_orig, $order) = @{$attr->{$a}}; printf "%s = %dH%s -- %s\n", $a, length $val, join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $val)), $val_orig; } } } } ############################################################################### sub trim ($) { my($s) = @_; $s =~ s/^(?:\s|\ $re_end_entity)+//os; $s =~ s/(?:\s|\ $re_end_entity)+$//os; return $s; } ############################################################################### sub text_extract (*) { my($h) = @_; my %text = (); for (;;) { my $s = next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME if ($kind eq KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; } elsif ($kind eq KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = trim $val; $text{$val} = 1 if $val =~ /\S/s; } } } } # Emit all extracted strings. # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (keys %text) { printf "%s\n", $t unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; } } ############################################################################### sub usage ($) { my($exitcode) = @_; my $h = $exitcode? *STDERR: *STDOUT; print $h <]+))*\s*(?:--)?)>}; ! # TMPL_VAR or TMPL_INCLUDE ! $re_tmpl_var = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! $re_tmpl_include = q{<(?:(?i)(?:!--\s*)?TMPL_(?:INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # TMPL_VAR ESCAPE=1/HTML/URL ! $re_tmpl_var_escaped = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR|INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))\s+ESCAPE=(?:1|HTML|URL)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # Any control flow directive ! $re_directive_control = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:LOOP|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # /LOOP or /IF or /UNLESS ! $re_tmpl_endif_endloop = q{<(?:(?i)(?:!--\s*)?\/TMPL_(?:LOOP|IF|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! } ! ! # Hideous stuff from subst.pl, slightly modified to use the above hideous stuff ! # Note: The $re_tag's set $1 (), and $3 (rest of string) ! use vars qw( $re_comment $re_entity_name $re_end_entity $re_etag ); ! use vars qw( $re_tag_strict $re_tag_compat @re_tag ); ! sub re_tag ($) { ! my($compat) = @_; ! my $etag = $compat? '>': '<>\/'; ! # This is no longer similar to the original regexp in subst.pl :-( ! # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} ! . $re_directive ! . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; ! } ! BEGIN { ! $re_comment = '(?:--(?:[^-]|-[^-])*--)'; ! $re_entity_name = '(?:[^&%#;<>\s]+)'; # NOTE: not really correct SGML ! $re_end_entity = '(?:;|$|(?=\s))'; # semicolon or before-whitespace ! $re_etag = q{(?:<\/?(?:"[^"]*"|'[^']*'|[^"'>\/])*[>\/])}; # end-tag ! @re_tag = ($re_tag_strict, $re_tag_compat) = (re_tag(0), re_tag(1)); ! } ! ! # End of the hideous stuff ! ! sub KIND_TEXT () { 'TEXT' } ! sub KIND_CDATA () { 'CDATA' } ! sub KIND_TAG () { 'TAG' } ! sub KIND_DECL () { 'DECL' } ! sub KIND_PI () { 'PI' } ! sub KIND_DIRECTIVE () { 'HTML::Template' } ! sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment ! sub KIND_UNKNOWN () { 'ERROR' } ! ! use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); ! use vars qw( $cdata_mode_p $cdata_close ); ! ! ############################################################################### ! ! use vars qw( $appName $input_abbr ); ! ! sub construct_warn_prefix ($$) { ! my($prefix, $lc) = @_; ! # Construct some short but should-be-still-useful versions ! # of this script's name and the input file's name ! my $appName = $& if !defined $appName && $0 =~ /[^\/]+$/; ! my $input_abbr = $& if !defined $input_abbr && $input =~ /[^\/]+$/; ! # FIXME: The line number is not accurate, but should be "close enough" ! # FIXME: This wording is worse than what was there, but it's wrong to ! # FIXME: hard-code this thing in each warn statement. Need improvement. ! return "$appName: $prefix: " . (defined $lc? "$input_abbr: line $lc: ": "$input_abbr: "); ! } ! ! sub warn_normal ($$) { ! my($msg, $lc) = @_; ! my $prefix = construct_warn_prefix('Warning', $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg"; ! } ! ! sub warn_pedantic ($$$) { ! my($msg, $lc, $flag) = @_; ! my $prefix = construct_warn_prefix("Warning$pedantic_tag", $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg" if $pedantic_p || !$$flag; ! if (!$pedantic_p) { ! $prefix = construct_warn_prefix("Warning$pedantic_tag", undef); ! warn $prefix."Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; ! $$flag = 1; ! } ! } ! ! ############################################################################### ! ! sub extract_attributes ($;$) { ! my($s, $lc) = @_; ! my %attr; ! $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags ! ! for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { ! my($key, $val, $val_orig, $rest) ! = ($1, (defined $3? $3: defined $4? $4: $5), $2, $'); ! $i += 1; ! $attr{+lc($key)} = [$key, $val, $val_orig, $i]; ! $s = $rest; ! if ($val =~ /$re_tmpl_include/os) { ! warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; ! } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { ! # XXX: we probably should not warn if key is "onclick" etc ! # XXX: there's just no reasonable thing to suggest ! my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); ! undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic ! "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . ": $val_orig", ! $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p ! if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); ! } elsif ($val_orig !~ /^['"]/) { ! my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic ! "Unquoted attribute contains character(s) that should be quoted" ! . ": $val_orig", ! $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p ! if $t =~ /[^-\.A-Za-z0-9]/s; ! } ! } ! my $s2 = $s; $s2 =~ s/$re_tmpl_endif_endloop//g; # for the next check ! if ($s2 =~ /\S/s) { # should never happen ! if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! my $prefix = construct_warn_prefix('Error: ', $lc); ! warn $prefix . "Completely confused while extracting attributes" ! . ": $1\n"; ! warn $prefix . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; ! $fatal_p = 1; ! } else { ! warn "Strange attribute syntax: $s\n", $lc; ! } ! } ! return \%attr; ! } ! ! sub next_token_internal (*) { ! my($h) = @_; ! my($it, $kind); ! my $eof_p = 0; ! if (!defined $readahead || !length $readahead) { ! my $next = scalar <$h>; ! $eof_p = !defined $next; ! if (!$eof_p) { ! $lc += 1; ! $readahead .= $next; ! } ! } ! $lc_0 = $lc; # remember line number of first line ! if ($eof_p && !length $readahead) { # nothing left to do ! ; ! } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn "Warning: Unescaped < $it\n", $lc_0 ! if !$cdata_mode_p && $it =~ /", $3); ! $ok_p = 1; ! warn "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); ! $ok_p = 1; ! warn "Syntax error in comment: $&\n", $lc_0; ! $syntaxerror_p = 1; ! } ! last if $ok_p; ! my $next = scalar <$h>; ! $eof_p = !defined $next; ! last if $eof_p; ! $lc += 1; ! $readahead .= $next; ! } ! if ($kind ne KIND_TAG) { ! ; ! } elsif ($it =~ /^).)*-->/; ! } elsif ($it =~ /^<\?/) { ! $kind = KIND_PI; ! } ! if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = KIND_DIRECTIVE; ! } ! if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); ! $syntaxerror_p = 1; ! } ! } ! warn "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq KIND_UNKNOWN; ! return defined $it? (wantarray? ($kind, $it): ! [$kind, $it]): undef; ! } ! ! sub next_token (*) { ! my($h) = @_; ! my $it; ! if (!$cdata_mode_p) { ! $it = next_token_internal($h); ! if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ! ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME ! push @$it, extract_attributes($it->[1], $lc_0); #FIXME ! } ! } else { ! for ($it = '';;) { ! my $lc_prev = $lc; ! my $next = next_token_internal($h); ! last if !defined $next; ! if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ! ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME ! $cdata_mode_p = 0; ! } ! last unless $cdata_mode_p; ! $it .= $next->[1]; #FIXME ! } ! $it = [KIND_CDATA, $it]; #FIXME ! $cdata_close = undef; ! } ! return defined $it? (wantarray? @$it: $it): undef; ! } ############################################################################### --- 16,26 ---- use Getopt::Long; + use TmplTokenizer; + use VerboseWarnings; use strict; use vars qw( $input ); use vars qw( $debug_dump_only_p ); ! use vars qw( $pedantic_p ); ############################################################################### *************** *** 268,274 **** sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$re_tag_compat/\n"; for (;;) { ! my $s = next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); --- 28,34 ---- sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$TmplTokenizer::re_tag_compat/\n"; for (;;) { ! my $s = TmplTokenizer::next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); *************** *** 277,281 **** printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { --- 37,41 ---- printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenizer::KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { *************** *** 293,298 **** sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $re_end_entity)+//os; ! $s =~ s/(?:\s|\ $re_end_entity)+$//os; return $s; } --- 53,58 ---- sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $TmplTokenizer::re_end_entity)+//os; ! $s =~ s/(?:\s|\ $TmplTokenizer::re_end_entity)+$//os; return $s; } *************** *** 304,314 **** my %text = (); for (;;) { ! my $s = next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; --- 64,74 ---- my %text = (); for (;;) { ! my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq TmplTokenizer::KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenizer::KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; *************** *** 329,333 **** for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; } } --- 89,93 ---- for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $TmplTokenizer::re_end_entity|$TmplTokenizer::re_tmpl_var)*$/os || $t =~ /^\d+$/; } } *************** *** 367,371 **** 'help' => sub { usage(0) }, ) || usage_error; ! $pedantic_tag = $pedantic_p? '': ' (negligible)'; usage_error('Missing mandatory option -f') unless defined $input; --- 127,135 ---- 'help' => sub { usage(0) }, ) || usage_error; ! ! VerboseWarnings::set_application_name $0; ! VerboseWarnings::set_input_file_name $input; ! VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') unless defined $input; *************** *** 378,384 **** warn "This input will not work with Mozilla standards-compliant mode\n", undef ! if $syntaxerror_p; close INPUT; ! exit(-1) if $fatal_p; --- 142,148 ---- warn "This input will not work with Mozilla standards-compliant mode\n", undef ! if TmplTokenizer::syntaxerror_p; close INPUT; ! exit(-1) if TmplTokenizer::fatal_p; From acli at users.sourceforge.net Tue Feb 17 00:46:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:46:38 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.1,1.2 text-extract2.pl,1.34,1.35 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5197 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Some functions should not be in the module; these are now removed. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplTokenizer.pm 16 Feb 2004 23:42:57 -0000 1.1 --- TmplTokenizer.pm 16 Feb 2004 23:46:34 -0000 1.2 *************** *** 266,294 **** ############################################################################### - sub debug_dump (*) { # for testing only - my($h) = @_; - print "re_tag_compat is /$re_tag_compat/\n"; - for (;;) { - my $s = next_token $h; - last unless defined $s; - printf "%s\n", ('-' x 79); - my($kind, $t, $attr) = @$s; # FIXME - printf "%s:\n", $kind; - printf "%4dH%s\n", length($t), - join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); - if ($kind eq KIND_TAG && %$attr) { - printf "Attributes:\n"; - for my $a (keys %$attr) { - my($key, $val, $val_orig, $order) = @{$attr->{$a}}; - printf "%s = %dH%s -- %s\n", $a, length $val, - join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $val)), - $val_orig; - } - } - } - } - - ############################################################################### - sub trim ($) { my($s) = @_; --- 266,269 ---- *************** *** 300,364 **** ############################################################################### - sub text_extract (*) { - my($h) = @_; - my %text = (); - for (;;) { - my $s = next_token $h; - last unless defined $s; - my($kind, $t, $attr) = @$s; # FIXME - if ($kind eq KIND_TEXT) { - $t = trim $t; - $text{$t} = 1 if $t =~ /\S/s; - } elsif ($kind eq KIND_TAG && %$attr) { - # value [tag=input], meta - my $tag = lc($1) if $t =~ /^<(\S+)/s; - for my $a ('alt', 'content', 'title', 'value') { - if ($attr->{$a}) { - next if $a eq 'content' && $tag ne 'meta'; - next if $a eq 'value' && ($tag ne 'input' - || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME - my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME - $val = trim $val; - $text{$val} = 1 if $val =~ /\S/s; - } - } - } - } - # Emit all extracted strings. - # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. - for my $t (keys %text) { - printf "%s\n", $t - unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; - } - } - - ############################################################################### - - sub usage ($) { - my($exitcode) = @_; - my $h = $exitcode? *STDERR: *STDOUT; - print $h <{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME ! $val = trim $val; $text{$val} = 1 if $val =~ /\S/s; } --- 70,74 ---- || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME ! $val = TmplTokenizer::trim $val; $text{$val} = 1 if $val =~ /\S/s; } From acli at users.sourceforge.net Tue Feb 17 00:50:58 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:50:58 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.2,1.3 text-extract2.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6213 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Avoid direct accessing of variables inside the module Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplTokenizer.pm 16 Feb 2004 23:46:34 -0000 1.2 --- TmplTokenizer.pm 16 Feb 2004 23:50:56 -0000 1.3 *************** *** 266,269 **** --- 266,276 ---- ############################################################################### + # Other easy functions + + sub blank_p ($) { + my($s) = @_; + return $s =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os; + } + sub trim ($) { my($s) = @_; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** text-extract2.pl 16 Feb 2004 23:46:34 -0000 1.35 --- text-extract2.pl 16 Feb 2004 23:50:56 -0000 1.36 *************** *** 28,32 **** sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$TmplTokenizer::re_tag_compat/\n"; for (;;) { my $s = TmplTokenizer::next_token $h; --- 28,32 ---- sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; for (;;) { my $s = TmplTokenizer::next_token $h; *************** *** 80,84 **** for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $TmplTokenizer::re_end_entity|$TmplTokenizer::re_tmpl_var)*$/os || $t =~ /^\d+$/; } } --- 80,84 ---- for my $t (keys %text) { printf "%s\n", $t ! unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } From acli at users.sourceforge.net Tue Feb 17 03:45:30 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 18:45:30 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplToken.pm,NONE,1.1 TmplTokenType.pm,NONE,1.1 TmplTokenizer.pm,1.3,1.4 VerboseWarnings.pm,1.1,1.2 text-extract2.pl,1.36,1.37 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6928 Modified Files: TmplTokenizer.pm VerboseWarnings.pm text-extract2.pl Added Files: TmplToken.pm TmplTokenType.pm Log Message: Further breaking up of the TmplTokenizer module. A couple of minor fixes. --- NEW FILE --- package TmplToken; use strict; use TmplTokenType; require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplToken.pm - Object representing a scanner token for .tmpl files =head1 DESCRIPTION This is a class representing a token scanned from an HTML::Template .tmpl file. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw(); ############################################################################### sub new { my $this = shift; my $class = ref($this) || $this; my $self = {}; bless $self, $class; ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}) = @_; return $self; } sub string { my $this = shift; return $this->{'_string'} } sub type { my $this = shift; return $this->{'_type'} } sub line_number { my $this = shift; return $this->{'_lc'} } sub attributes { my $this = shift; return $this->{'_attr'}; } sub set_attributes { my $this = shift; $this->{'_attr'} = ref $_[0] eq 'HASH'? $_[0]: \@_; return $this; } ############################################################################### 1; --- NEW FILE --- package TmplTokenType; use strict; require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplTokenType.pm - Types of TmplToken objects =head1 DESCRIPTION This is a Java-style "safe enum" singleton class for types of TmplToken objects. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw( &TEXT &CDATA &TAG &DECL &PI &DIRECTIVE &COMMENT &UNKNOWN ); ############################################################################### use vars qw( $_text $_cdata $_tag $_decl $_pi $_directive $_comment $_unknown ); BEGIN { my $new = sub { my $this = shift; my $class = ref($this) || $this; my $self = {}; bless $self, $class; ($self->{'id'}, $self->{'name'}, $self->{'desc'}) = @_; return $self; }; $_text = &$new(0, 'TEXT'); $_cdata = &$new(1, 'CDATA'); $_tag = &$new(2, 'TAG'); $_decl = &$new(3, 'DECL'); $_pi = &$new(4, 'PI'); $_directive = &$new(5, 'DIRECTIVE'); $_comment = &$new(6, 'COMMENT'); $_unknown = &$new(7, 'UNKNOWN'); } sub to_string { my $this = shift; return $this->{'name'} } sub TEXT () { $_text } sub CDATA () { $_cdata } sub TAG () { $_tag } sub DECL () { $_decl } sub PI () { $_pi } sub DIRECTIVE () { $_directive } sub COMMENT () { $_comment } sub UNKNOWN () { $_unknown } ############################################################################### 1; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TmplTokenizer.pm 16 Feb 2004 23:50:56 -0000 1.3 --- TmplTokenizer.pm 17 Feb 2004 02:45:27 -0000 1.4 *************** *** 2,5 **** --- 2,7 ---- use strict; + use TmplTokenType; + use TmplToken; use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic ); require Exporter; *************** *** 33,46 **** @ISA = qw(Exporter); ! @EXPORT_OK = qw( ! &KIND_TEXT ! &KIND_CDATA ! &KIND_TAG ! &KIND_DECL ! &KIND_PI ! &KIND_DIRECTIVE ! &KIND_COMMENT ! &KIND_UNKNOWN ! ); use vars qw( $input ); --- 35,39 ---- @ISA = qw(Exporter); ! @EXPORT_OK = qw(); use vars qw( $input ); *************** *** 92,104 **** # End of the hideous stuff - sub KIND_TEXT () { 'TEXT' } - sub KIND_CDATA () { 'CDATA' } - sub KIND_TAG () { 'TAG' } - sub KIND_DECL () { 'DECL' } - sub KIND_PI () { 'PI' } - sub KIND_DIRECTIVE () { 'HTML::Template' } - sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment - sub KIND_UNKNOWN () { 'ERROR' } - use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); --- 85,88 ---- *************** *** 180,188 **** ; } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn_normal "Warning: Unescaped < $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; --- 175,190 ---- if ($cdata_mode_p) { if ($readahead =~ /^$cdata_close/) { ! ($kind, $it, $readahead) = (TmplTokenType::TAG, $&, $'); $ok_p = 1; } else { ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $readahead, undef); $ok_p = 1; } } elsif ($readahead =~ /^$re_tag_compat/os) { ! ($kind, $it, $readahead) = (TmplTokenType::TAG, "$1>", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; *************** *** 214,237 **** $readahead .= $next; } ! if ($kind ne KIND_TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { ! $kind = KIND_PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = KIND_DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq KIND_UNKNOWN; ! return defined $it? (wantarray? ($kind, $it): ! [$kind, $it]): undef; } --- 198,220 ---- $readahead .= $next; } ! if ($kind ne TmplTokenType::TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { ! $kind = TmplTokenType::PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (TmplTokenType::UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? TmplToken->new($it, $kind, $lc): undef; } *************** *** 241,248 **** if (!$cdata_mode_p) { $it = next_token_internal($h); ! if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME ! push @$it, extract_attributes($it->[1], $lc_0); #FIXME } } else { --- 224,231 ---- if (!$cdata_mode_p) { $it = next_token_internal($h); ! if (defined $it && $it->type eq TmplTokenType::TAG) { ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->string =~ /^<(script|style|textarea)\b/i; ! $it->set_attributes( extract_attributes($it->string, $lc_0) ); } } else { *************** *** 251,265 **** my $next = next_token_internal($h); last if !defined $next; ! if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ! ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME $cdata_mode_p = 0; } last unless $cdata_mode_p; ! $it .= $next->[1]; #FIXME } ! $it = [KIND_CDATA, $it]; #FIXME $cdata_close = undef; } ! return defined $it? (wantarray? @$it: $it): undef; } --- 234,248 ---- my $next = next_token_internal($h); last if !defined $next; ! if (defined $next && $next->string =~ /$cdata_close/i) { ! ($lc, $readahead) = ($lc_prev, $next->string . $readahead); $cdata_mode_p = 0; } last unless $cdata_mode_p; ! $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $lc ); $cdata_close = undef; } ! return $it; } *************** *** 291,293 **** --- 274,288 ---- rework in tmpl_process.pl + Gettext-style line number references would also be very helpful in + disambiguating the strings. Ultimately, we should generate and work + with gettext-style po files, so that translators are able to use + tools designed for gettext. + + An example of a string untranslatable to Chinese is "Accounts for"; + "Accounts for %s", however, would be translatable. Short words like + "in" would also be untranslatable, not only to Chinese, but also to + languages requiring declension of nouns. + =cut + + 1; Index: VerboseWarnings.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/VerboseWarnings.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** VerboseWarnings.pm 16 Feb 2004 23:42:57 -0000 1.1 --- VerboseWarnings.pm 17 Feb 2004 02:45:27 -0000 1.2 *************** *** 25,31 **** @ISA = qw(Exporter); @EXPORT_OK = qw( - &set_application_name - &set_input_file_name - &set_pedantic_mode &pedantic_p &warn_normal --- 25,28 ---- *************** *** 46,50 **** my($s) = @_; $input = $s; ! $input_abbr = $& if !defined $input && defined $s && $s =~ /[^\/]+$/; } --- 43,47 ---- my($s) = @_; $input = $s; ! $input_abbr = $& if defined $s && $s =~ /[^\/]+$/; } Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** text-extract2.pl 16 Feb 2004 23:50:56 -0000 1.36 --- text-extract2.pl 17 Feb 2004 02:45:27 -0000 1.37 *************** *** 33,41 **** last unless defined $s; printf "%s\n", ('-' x 79); ! my($kind, $t, $attr) = @$s; # FIXME printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenizer::KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { --- 33,41 ---- last unless defined $s; printf "%s\n", ('-' x 79); ! my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenType::TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { *************** *** 57,65 **** my $s = TmplTokenizer::next_token $h; last unless defined $s; ! my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq TmplTokenizer::KIND_TEXT) { $t = TmplTokenizer::trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenizer::KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; --- 57,65 ---- my $s = TmplTokenizer::next_token $h; last unless defined $s; ! my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! if ($kind eq TmplTokenType::TEXT) { $t = TmplTokenizer::trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenType::TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; From acli at users.sourceforge.net Tue Feb 17 04:02:41 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 19:02:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenType.pm,1.1,1.2 text-extract2.pl,1.37,1.38 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11024 Modified Files: TmplTokenType.pm text-extract2.pl Log Message: Fixed more bugs during the modularization Index: TmplTokenType.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenType.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplTokenType.pm 17 Feb 2004 02:45:27 -0000 1.1 --- TmplTokenType.pm 17 Feb 2004 03:02:39 -0000 1.2 *************** *** 40,44 **** BEGIN { my $new = sub { ! my $this = shift; my $class = ref($this) || $this; my $self = {}; --- 40,44 ---- BEGIN { my $new = sub { ! my $this = 'TmplTokenType';#shift; my $class = ref($this) || $this; my $self = {}; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** text-extract2.pl 17 Feb 2004 02:45:27 -0000 1.37 --- text-extract2.pl 17 Feb 2004 03:02:39 -0000 1.38 *************** *** 34,38 **** printf "%s\n", ('-' x 79); my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); --- 34,38 ---- printf "%s\n", ('-' x 79); my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! printf "%s [line %d]:\n", $kind->to_string, $s->line_number; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); From acli at users.sourceforge.net Tue Feb 17 04:17:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 19:17:57 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13338 Modified Files: TmplTokenizer.pm Log Message: Still more bugfixes for my own bugs. $readahead is now an array @readahead which can contain TmplToken objects, so "ungetting" tokens should not disturb the line number counter any more. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** TmplTokenizer.pm 17 Feb 2004 02:45:27 -0000 1.4 --- TmplTokenizer.pm 17 Feb 2004 03:17:48 -0000 1.5 *************** *** 85,89 **** # End of the hideous stuff ! use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); --- 85,89 ---- # End of the hideous stuff ! use vars qw( @readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); *************** *** 152,171 **** my($it, $kind); my $eof_p = 0; ! if (!defined $readahead || !length $readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; ! $readahead .= $next; } } $lc_0 = $lc; # remember line number of first line ! if ($eof_p && !length $readahead) { # nothing left to do ; ! } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $&, $'); warn_normal "Unescaped < in $it\n", $lc_0 if !$cdata_mode_p && $it =~ /; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; ! push @readahead, $next; } } $lc_0 = $lc; # remember line number of first line ! if (@readahead && ref $readahead[$#readahead]) { # TmplToken object ! my $t = pop @readahead; ! ($it, $kind, local $lc) = ($t->string, $t->type, $t->line_number); ! } elsif ($eof_p && !@readahead) { # nothing left to do ; ! } elsif ($readahead[$#readahead] =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead[$#readahead] =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); warn_normal "Unescaped < in $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; --- 179,195 ---- for (;;) { if ($cdata_mode_p) { ! if ($readahead[$#readahead] =~ /^$cdata_close/) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TAG, $&, $'); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, pop @readahead); $ok_p = 1; } ! } elsif ($readahead[$#readahead] =~ /^$re_tag_compat/os) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TAG, "$1>", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead[$#readahead] =~ /^).)*-->/s) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; *************** *** 196,200 **** last if $eof_p; $lc += 1; ! $readahead .= $next; } if ($kind ne TmplTokenType::TAG) { --- 201,205 ---- last if $eof_p; $lc += 1; ! $readahead[$#readahead] .= $next; } if ($kind ne TmplTokenType::TAG) { *************** *** 210,214 **** } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (TmplTokenType::UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } --- 215,219 ---- } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::UNKNOWN, $readahead[$#readahead], undef); $syntaxerror_p = 1; } *************** *** 235,239 **** last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! ($lc, $readahead) = ($lc_prev, $next->string . $readahead); $cdata_mode_p = 0; } --- 240,245 ---- last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! push @readahead, $next; # push the entire TmplToken object ! #$lc = $lc_prev; XXX $cdata_mode_p = 0; } From acli at users.sourceforge.net Tue Feb 17 06:07:06 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 21:07:06 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.5,1.6 text-extract2.pl,1.38,1.39 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30220 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Converted TmplTokenizer into a class. Everything still seems ok, but it is not tested thoroughly. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** TmplTokenizer.pm 17 Feb 2004 03:17:48 -0000 1.5 --- TmplTokenizer.pm 17 Feb 2004 05:07:04 -0000 1.6 *************** *** 13,17 **** =head1 NAME ! TmplTokenizer.pm - Simple-minded tokenizer for HTML::Template .tmpl files =head1 DESCRIPTION --- 13,17 ---- =head1 NAME ! TmplTokenizer.pm - Simple-minded tokenizer class for HTML::Template .tmpl files =head1 DESCRIPTION *************** *** 32,45 **** ############################################################################### ! $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw(); - use vars qw( $input ); - use vars qw( $debug_dump_only_p ); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); - use vars qw( $fatal_p ); ############################################################################### --- 32,42 ---- ############################################################################### ! $VERSION = 0.02; @ISA = qw(Exporter); @EXPORT_OK = qw(); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); ############################################################################### *************** *** 85,106 **** # End of the hideous stuff ! use vars qw( @readahead $lc_0 $lc $syntaxerror_p ); ! use vars qw( $cdata_mode_p $cdata_close ); ############################################################################### ! # Easy accessors ! sub fatal_p () { ! return $fatal_p; } ! sub syntaxerror_p () { ! return $syntaxerror_p; } ############################################################################### ! sub extract_attributes ($;$) { my($s, $lc) = @_; my %attr; --- 82,234 ---- # End of the hideous stuff ! use vars qw( $serial ); ############################################################################### ! sub FATAL_P () {'fatal-p'} ! sub SYNTAXERROR_P () {'syntaxerror-p'} ! sub FILENAME () {'input'} ! sub HANDLE () {'handle'} ! ! sub READAHEAD () {'readahead'} ! sub LINENUM_START () {'lc_0'} ! sub LINENUM () {'lc'} ! sub CDATA_MODE_P () {'cdata-mode-p'} ! sub CDATA_CLOSE () {'cdata-close'} ! ! sub new { ! my $this = shift; ! my($input) = @_; ! my $class = ref($this) || $this; ! my $self = {}; ! bless $self, $class; ! ! my $handle = sprintf('TMPLTOKENIZER%d', $serial); ! $serial += 1; ! ! no strict; ! open($handle, "<$input") || die "$input: $!\n"; ! use strict; ! $self->{+FILENAME} = $input; ! $self->{+HANDLE} = $handle; ! $self->{+READAHEAD} = []; ! return $self; ! } ! ! ############################################################################### ! ! # Simple getters ! ! sub _handle { ! my $this = shift; ! return $this->{+HANDLE}; ! } ! ! sub fatal_p { ! my $this = shift; ! return $this->{+FATAL_P}; ! } ! ! sub syntaxerror_p { ! my $this = shift; ! return $this->{+SYNTAXERROR_P}; ! } ! ! sub has_readahead_p { ! my $this = shift; ! return @{$this->{+READAHEAD}}; ! } ! ! sub _peek_readahead { ! my $this = shift; ! return $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}]; } ! sub line_number_start { ! my $this = shift; ! return $this->{+LINENUM_START}; ! } ! ! sub line_number { ! my $this = shift; ! return $this->{+LINENUM}; ! } ! ! sub cdata_mode_p { ! my $this = shift; ! return $this->{+CDATA_MODE_P}; ! } ! ! sub cdata_close { ! my $this = shift; ! return $this->{+CDATA_CLOSE}; ! } ! ! # Simple setters ! ! sub _set_fatal { ! my $this = shift; ! $this->{+FATAL_P} = $_[0]; ! return $this; ! } ! ! sub _set_syntaxerror { ! my $this = shift; ! $this->{+SYNTAXERROR_P} = $_[0]; ! return $this; ! } ! ! sub _push_readahead { ! my $this = shift; ! push @{$this->{+READAHEAD}}, $_[0]; ! return $this; ! } ! ! sub _pop_readahead { ! my $this = shift; ! return pop @{$this->{+READAHEAD}}; ! } ! ! sub _append_readahead { ! my $this = shift; ! $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}] .= $_[0]; ! return $this; ! } ! ! sub _set_readahead { ! my $this = shift; ! $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}] = $_[0]; ! return $this; ! } ! ! sub _increment_line_number { ! my $this = shift; ! $this->{+LINENUM} += 1; ! return $this; ! } ! ! sub _set_line_number_start { ! my $this = shift; ! $this->{+LINENUM_START} = $_[0]; ! return $this; ! } ! ! sub _set_cdata_mode { ! my $this = shift; ! $this->{+CDATA_MODE_P} = $_[0]; ! return $this; ! } ! ! sub _set_cdata_close { ! my $this = shift; ! $this->{+CDATA_CLOSE} = $_[0]; ! return $this; } ############################################################################### ! sub _extract_attributes ($;$) { ! my $this = shift; my($s, $lc) = @_; my %attr; *************** *** 140,144 **** error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); ! $fatal_p = 1; } else { warn_normal "Strange attribute syntax: $s\n", $lc; --- 268,272 ---- error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); ! $this->_set_fatal( 1 ); } else { warn_normal "Strange attribute syntax: $s\n", $lc; *************** *** 148,198 **** } ! sub next_token_internal (*) { my($h) = @_; my($it, $kind); my $eof_p = 0; ! pop @readahead if @readahead && !ref $readahead[$#readahead] ! && !length $readahead[$#readahead]; ! if (!@readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { ! $lc += 1; ! push @readahead, $next; } } ! $lc_0 = $lc; # remember line number of first line ! if (@readahead && ref $readahead[$#readahead]) { # TmplToken object ! my $t = pop @readahead; ! ($it, $kind, local $lc) = ($t->string, $t->type, $t->line_number); ! } elsif ($eof_p && !@readahead) { # nothing left to do ; ! } elsif ($readahead[$#readahead] =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead[$#readahead] =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); ! warn_normal "Unescaped < in $it\n", $lc_0 ! if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead[$#readahead] =~ /^).)*-->/s) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $lc_0; ! $syntaxerror_p = 1; } last if $ok_p; --- 276,332 ---- } ! sub _next_token_internal { ! my $this = shift; my($h) = @_; my($it, $kind); my $eof_p = 0; ! $this->_pop_readahead if $this->has_readahead_p ! && !ref $this->_peek_readahead ! && !length $this->_peek_readahead; ! if (!$this->has_readahead_p) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { ! $this->_increment_line_number; ! $this->_push_readahead( $next ); } } ! $this->_set_line_number_start( $this->line_number ); # remember 1st line num ! if ($this->has_readahead_p && ref $this->_peek_readahead) { # TmplToken obj. ! ($it, $kind) = ($this->_pop_readahead, undef); ! } elsif ($eof_p && !$this->has_readahead_p) { # nothing left to do ; ! } elsif ($this->_peek_readahead =~ /^\s+/s) { # whitespace ! ($kind, $it) = (TmplTokenType::TEXT, $&); ! $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it) = (TmplTokenType::TEXT, $&); ! $this->_set_readahead( $' ); ! warn_normal "Unescaped < in $it\n", $this->line_number_start ! if !$this->cdata_mode_p && $it =~ /cdata_close;;) { ! if ($this->cdata_mode_p) { ! if ($this->_peek_readahead =~ /^$cdata_close/) { ! ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_set_readahead( $' ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $this->_pop_readahead); $ok_p = 1; } ! } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! ($kind, $it) = (TmplTokenType::TAG, "$1>"); ! $this->_set_readahead( $3 ); $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $this->line_number_start if $2 eq ''; ! } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ! ($kind, $it) = (TmplTokenType::COMMENT, $&); ! $this->_set_readahead( $' ); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $this->line_number_start; ! $this->_set_syntaxerror( 1 ); } last if $ok_p; *************** *** 200,205 **** $eof_p = !defined $next; last if $eof_p; ! $lc += 1; ! $readahead[$#readahead] .= $next; } if ($kind ne TmplTokenType::TAG) { --- 334,339 ---- $eof_p = !defined $next; last if $eof_p; ! $this->_increment_line_number; ! $this->_append_readahead( $next ); } if ($kind ne TmplTokenType::TAG) { *************** *** 211,252 **** $kind = TmplTokenType::PI; } ! if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::UNKNOWN, $readahead[$#readahead], undef); ! $syntaxerror_p = 1; } } ! warn_normal "Unrecognizable token found: $it\n", $lc_0 if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? TmplToken->new($it, $kind, $lc): undef; } ! sub next_token (*) { ! my($h) = @_; my $it; ! if (!$cdata_mode_p) { ! $it = next_token_internal($h); if (defined $it && $it->type eq TmplTokenType::TAG) { ! ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->string =~ /^<(script|style|textarea)\b/i; ! $it->set_attributes( extract_attributes($it->string, $lc_0) ); } } else { ! for ($it = '';;) { ! my $lc_prev = $lc; ! my $next = next_token_internal($h); last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! push @readahead, $next; # push the entire TmplToken object ! #$lc = $lc_prev; XXX ! $cdata_mode_p = 0; } ! last unless $cdata_mode_p; $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $lc ); ! $cdata_close = undef; } return $it; --- 345,388 ---- $kind = TmplTokenType::PI; } ! if ($it =~ /^$re_directive/ios && !$this->cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it) = (TmplTokenType::UNKNOWN, $this->_peek_readahead); ! $this->_set_readahead, undef; ! $this->_set_syntaxerror( 1 ); } } ! warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number)): undef; } ! sub next_token { ! my $this = shift; ! my $h = $this->_handle; my $it; ! if (!$this->cdata_mode_p) { ! $it = $this->_next_token_internal($h); if (defined $it && $it->type eq TmplTokenType::TAG) { ! if ($it->string =~ /^<(script|style|textarea)\b/i) { ! $this->_set_cdata_mode( 1 ); ! $this->_set_cdata_close( "" ); ! } ! $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); } } else { ! for ($it = '', my $cdata_close = $this->cdata_close;;) { ! my $next = $this->_next_token_internal($h); last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! $this->_push_readahead( $next ); # push entire TmplToken object ! $this->_set_cdata_mode( 0 ); } ! last unless $this->cdata_mode_p; $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); ! $this->_set_cdata_close, undef; } return $it; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** text-extract2.pl 17 Feb 2004 03:02:39 -0000 1.38 --- text-extract2.pl 17 Feb 2004 05:07:04 -0000 1.39 *************** *** 26,30 **** ############################################################################### ! sub debug_dump (*) { # for testing only my($h) = @_; print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; --- 26,30 ---- ############################################################################### ! sub debug_dump ($) { # for testing only my($h) = @_; print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; *************** *** 51,55 **** ############################################################################### ! sub text_extract (*) { my($h) = @_; my %text = (); --- 51,55 ---- ############################################################################### ! sub text_extract ($) { my($h) = @_; my %text = (); *************** *** 125,133 **** usage_error('Missing mandatory option -f') unless defined $input; ! open(INPUT, "<$input") || die "$0: $input: $!\n"; if ($debug_dump_only_p) { ! debug_dump(*INPUT); } else { ! text_extract(*INPUT); } --- 125,133 ---- usage_error('Missing mandatory option -f') unless defined $input; ! my $h = TmplTokenizer->new( $input ); if ($debug_dump_only_p) { ! debug_dump( $h ); } else { ! text_extract( $h ); } From acli at users.sourceforge.net Tue Feb 17 06:42:29 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 21:42:29 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.6,1.7 TmplToken.pm,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3053 Modified Files: TmplTokenizer.pm TmplToken.pm Log Message: Insert the filename of the token into the TmplToken object too Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** TmplTokenizer.pm 17 Feb 2004 05:07:04 -0000 1.6 --- TmplTokenizer.pm 17 Feb 2004 05:42:27 -0000 1.7 *************** *** 121,124 **** --- 121,129 ---- # Simple getters + sub filename { + my $this = shift; + return $this->{+FILENAME}; + } + sub _handle { my $this = shift; *************** *** 356,360 **** warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number)): undef; } --- 361,365 ---- warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number, $this->filename)): undef; } Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplToken.pm 17 Feb 2004 02:45:27 -0000 1.1 --- TmplToken.pm 17 Feb 2004 05:42:27 -0000 1.2 *************** *** 33,37 **** my $self = {}; bless $self, $class; ! ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}) = @_; return $self; } --- 33,37 ---- my $self = {}; bless $self, $class; ! ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}, $self->{'_path'}) = @_; return $self; } *************** *** 47,50 **** --- 47,55 ---- } + sub pathname { + my $this = shift; + return $this->{'_path'} + } + sub line_number { my $this = shift; From acli at users.sourceforge.net Tue Feb 17 07:30:41 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 22:30:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator text-extract2.pl,1.39,1.40 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9919 Modified Files: text-extract2.pl Log Message: Don't extract strings from the VALUE attributes of RADIO type INPUT fields; these aren't translatable. Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -r1.39 -r1.40 *** text-extract2.pl 17 Feb 2004 05:07:04 -0000 1.39 --- text-extract2.pl 17 Feb 2004 06:30:38 -0000 1.40 *************** *** 68,72 **** next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' ! || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; --- 68,72 ---- next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' ! || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; From acli at users.sourceforge.net Tue Feb 17 08:26:31 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 23:26:31 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19352 Modified Files: TmplTokenizer.pm Log Message: Allow trim to return the trimmed whitespace if the caller wants them. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** TmplTokenizer.pm 17 Feb 2004 05:42:27 -0000 1.7 --- TmplTokenizer.pm 17 Feb 2004 07:26:29 -0000 1.8 *************** *** 405,411 **** sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $re_end_entity)+//os; ! $s =~ s/(?:\s|\ $re_end_entity)+$//os; ! return $s; } --- 405,410 ---- sub trim ($) { my($s) = @_; ! $s =~ /^(\s|\ $re_end_entity)*(.*)(\s|\ $re_end_entity)*$/os; ! return wantarray? ($2, $1, $3): $2; } From acli at users.sourceforge.net Tue Feb 17 08:45:19 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 23:45:19 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21841 Modified Files: TmplTokenizer.pm Log Message: The previous change was wrong. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** TmplTokenizer.pm 17 Feb 2004 07:26:29 -0000 1.8 --- TmplTokenizer.pm 17 Feb 2004 07:45:17 -0000 1.9 *************** *** 404,410 **** sub trim ($) { ! my($s) = @_; ! $s =~ /^(\s|\ $re_end_entity)*(.*)(\s|\ $re_end_entity)*$/os; ! return wantarray? ($2, $1, $3): $2; } --- 404,413 ---- sub trim ($) { ! my($s0) = @_; ! my $l0 = length $s0; ! my $s = $s0; ! $s =~ s/^(\s|\ $re_end_entity)+//os; my $l1 = $l0 - length $s; ! $s =~ s/(\s|\ $re_end_entity)+$//os; my $l2 = $l0 - $l1 - length $s; ! return wantarray? (substr($s0, 0, $l1), $s, substr($s0, $l0 - $l2)): $s; } From oleonard at users.sourceforge.net Tue Feb 17 21:20:46 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:20:46 -0800 Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.9.2.1,1.9.2.2 Message-ID: Update of /cvsroot/koha/koha/opac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9775/opac Modified Files: Tag: rel_2_0 opac-detail.pl Log Message: Fix for Bug 679 (courtesy Stephen) Index: opac-detail.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -r1.9.2.1 -r1.9.2.2 *** opac-detail.pl 6 Jan 2004 15:46:17 -0000 1.9.2.1 --- opac-detail.pl 17 Feb 2004 20:20:44 -0000 1.9.2.2 *************** *** 41,44 **** --- 41,54 ---- } + my @subjects; + my $subject; + my @subj = split /, /,($dat->{'subject'}); #split returned string into array + foreach my $subjct (@subj) { + $subject= { + SUBJECTS => $subjct, + }; + push @subjects, $subject; + } + $template->param(norequests => $norequests); *************** *** 49,56 **** --- 59,68 ---- my $webarray=\@webbiblioitems; my $sitearray=\@websites; + my $subjectsarray=\@subjects; $template->param(BIBLIO_RESULTS => $resultsarray); $template->param(ITEM_RESULTS => $itemsarray); $template->param(WEB_RESULTS => $webarray); + $template->param(SUBJECTS => $subjectsarray); $template->param(SITE_RESULTS => $sitearray, LibraryName => C4::Context->preference("LibraryName"), From oleonard at users.sourceforge.net Tue Feb 17 21:39:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:39:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.11.2.4,1.11.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13703/koha-tmpl/opac-tmpl/default/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -C2 -r1.11.2.4 -r1.11.2.5 *** opac-detail.tmpl 26 Jan 2004 10:49:11 -0000 1.11.2.4 --- opac-detail.tmpl 17 Feb 2004 20:39:05 -0000 1.11.2.5 *************** *** 19,40 **** ! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    Published by : in , ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    Total Number of Items:     --- 19,48 ---- ! ISBN: ">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    Published by : in , ,
    ! Collection:
    ! ! ! ! Subject(s): ! : "> !
    ! ! ! ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    Total Number of Items:     From oleonard at users.sourceforge.net Tue Feb 17 21:40:35 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:40:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.1.2.2,1.1.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13934/koha-tmpl/opac-tmpl/css/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-detail.tmpl 13 Jan 2004 17:28:30 -0000 1.1.2.2 --- opac-detail.tmpl 17 Feb 2004 20:40:33 -0000 1.1.2.3 *************** *** 23,27 **** ISBN:
    Collection:
    ! Subject:
    Year :
    Notes:
    --- 23,35 ---- ISBN:
    Collection:
    ! ! ! ! Subject(s): ! : "> !
    ! ! ! Year :
    Notes:
    From oleonard at users.sourceforge.net Tue Feb 17 21:43:10 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:43:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-detail.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14640/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-detail.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-detail.tmpl 18 Mar 2003 19:52:36 -0000 1.2 --- opac-detail.tmpl 17 Feb 2004 20:43:07 -0000 1.2.2.1 *************** *** 1,143 **** ! ! ! ! ! ! Details ! ! ! ! ! ! ! ! ! ! ! ! ! ! Home >Searching >Details ! ! !

    ! ! ! ! ! ! !
    ! ! ! !

    ! ()
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subtitle:
    Copyright:
    Subject: "> |
    Biblio Record:
    !

    		!
    ! ! > !
    !
    !     !

    ! !

    Holdings Information

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     
    Type/Format
    Class
    Location
    Due Date
    Last Seen
    Barcode
    !

    ! ! ! ! ! ! ! ! ! ! ! --- 1,143 ---- ! ! ! ! ! ! Details ! ! ! ! ! ! ! ! ! ! ! ! ! ! Home >Searching >Details ! ! !

    ! ! ! ! ! ! !
    ! ! ! !

    ! ()
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subtitle:
    Copyright:
    Subject(s): ! : "> !
    Biblio Record:
    !

    		!
    ! ! > !
    !
    !     !

    ! !

    Holdings Information

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     
    Type/Format
    Class
    Location
    Due Date
    Last Seen
    Barcode
    !

    ! ! ! ! ! ! ! ! ! ! ! From oleonard at users.sourceforge.net Tue Feb 17 23:15:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 14:15:09 -0800 Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.32,1.32.2.1 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3237/circ Modified Files: Tag: rel_2_0 returns.pl Log Message: Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info Index: returns.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/returns.pl,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -C2 -r1.32 -r1.32.2.1 *** returns.pl 28 Oct 2003 19:34:05 -0000 1.32 --- returns.pl 17 Feb 2004 22:15:06 -0000 1.32.2.1 *************** *** 189,192 **** --- 189,199 ---- $template->param( found => 1, name => $name, + borfirstname => $borr->{'firstname'}, + borsurname => $borr->{'surname'}, + bortitle => $borr->{'title'}, + borphone => $borr->{'phone'}, + borstraddress => $borr->{'streetaddress'}, + borcity => $borr->{'city'}, + borzip => $borr->{'zipcode'}, bornum => $res->{'borrowernumber'}, borcnum => $borr->{'cardnumber'}, *************** *** 218,222 **** borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! bortown => $borr->{'town'}, boremail => $borr->{'emailadress'}, barcode => $barcode --- 225,230 ---- borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! borcity => $borr->{'city'}, ! borzip => $borr->{'zipcode'}, boremail => $borr->{'emailadress'}, barcode => $barcode From oleonard at users.sourceforge.net Tue Feb 17 23:15:36 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 14:15:36 -0800 Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.32,1.33 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3305/circ Modified Files: returns.pl Log Message: Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info Index: returns.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/returns.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** returns.pl 28 Oct 2003 19:34:05 -0000 1.32 --- returns.pl 17 Feb 2004 22:15:33 -0000 1.33 *************** *** 189,192 **** --- 189,199 ---- $template->param( found => 1, name => $name, + borfirstname => $borr->{'firstname'}, + borsurname => $borr->{'surname'}, + bortitle => $borr->{'title'}, + borphone => $borr->{'phone'}, + borstraddress => $borr->{'streetaddress'}, + borcity => $borr->{'city'}, + borzip => $borr->{'zipcode'}, bornum => $res->{'borrowernumber'}, borcnum => $borr->{'cardnumber'}, *************** *** 218,222 **** borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! bortown => $borr->{'town'}, boremail => $borr->{'emailadress'}, barcode => $barcode --- 225,230 ---- borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! borcity => $borr->{'city'}, ! borzip => $borr->{'zipcode'}, boremail => $borr->{'emailadress'}, barcode => $barcode From acli at users.sourceforge.net Wed Feb 18 07:39:36 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 17 Feb 2004 22:39:36 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator translator_doc.txt,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30946 Modified Files: translator_doc.txt Log Message: Updated w.r.t. the text-extract2.pl filter. Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** translator_doc.txt 11 Feb 2004 08:42:02 -0000 1.2 --- translator_doc.txt 18 Feb 2004 06:39:34 -0000 1.3 *************** *** 34,37 **** --- 34,38 ---- - HTML::Templates pb : if there is only a tag between 2 strings, text-extract sometimes merges both strings, and so can't replace them in the translated template. I've solved all those cases with a
    or another HTML statement. + The text-extract2.pl filter attempts to address this problem; it seems that the new filter is now working correctly. - SHORT STATEMENTS *************** *** 67,70 **** --- 68,74 ---- - meta html encoding (8859-1) to enable non european translations. + - DIFFERENT WORD ORDER + Some languages have different word order than English in sentences, or even in dates. For these languages, it is impossible to make a good translation at the moment. + COPYRIGHT ====== From acli at users.sourceforge.net Wed Feb 18 07:56:23 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 17 Feb 2004 22:56:23 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1378 Modified Files: TmplTokenizer.pm Log Message: Warn against Apache #include directive Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** TmplTokenizer.pm 17 Feb 2004 07:45:17 -0000 1.9 --- TmplTokenizer.pm 18 Feb 2004 06:56:19 -0000 1.10 *************** *** 347,350 **** --- 347,353 ---- $kind = TmplTokenType::DECL; $kind = TmplTokenType::COMMENT if $it =~ /^).)*-->/; + if ($kind == TmplTokenType::COMMENT && $it =~ /^ Using per-directory sticky tag `rel_2_0' From tipaul at users.sourceforge.net Thu Feb 19 11:14:38 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:14:38 -0800 Subject: [Koha-cvs] CVS: koha/bookshelves addbookbybiblionumber.pl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22484/bookshelves Added Files: Tag: rel_2_0 addbookbybiblionumber.pl Log Message: new feature : adding book to bookshelf from biblio detail screen. --- NEW FILE --- #!/usr/bin/perl #script to provide bookshelf management # WARNING: This file uses 4-character tabs! # # $Header: /cvsroot/koha/koha/bookshelves/Attic/addbookbybiblionumber.pl,v 1.1.2.1 2004/02/19 10:14:36 tipaul Exp $ # # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA use strict; use C4::Search; use C4::Biblio; use CGI; use C4::Output; use C4::BookShelves; use C4::Circulation::Circ2; use C4::Auth; use C4::Interface::CGI::Output; use HTML::Template; my $env; my $query = new CGI; my $biblionumber = $query->param('biblionumber'); my $shelfnumber = $query->param('shelfnumber'); if ($shelfnumber) { &AddToShelfFromBiblio($env, $biblionumber, $shelfnumber); print "Content-Type: text/html\n\n"; exit; } else { my ( $bibliocount, @biblios ) = getbiblio($biblionumber); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "bookshelves/addbookbybiblionumber.tmpl", query => $query, type => "intranet", authnotrequired => 0, flagsrequired => {catalogue => 1}, }); my ($shelflist) = GetShelfList(); my @shelvesloop; my %shelvesloop; foreach my $element (sort keys %$shelflist) { push (@shelvesloop, $element); $shelvesloop{$element} = $shelflist->{$element}->{'shelfname'}; } my $CGIbookshelves=CGI::scrolling_list( -name => 'shelfnumber', -values => \@shelvesloop, -labels => \%shelvesloop, -size => 1, -multiple => 0 ); $template->param(biblionumber => $biblionumber, title => $biblios[0]->{'title'}, author => $biblios[0]->{'author'}, CGIbookshelves => $CGIbookshelves, ); output_html_with_http_headers $query, $cookie, $template->output; } # $Log: addbookbybiblionumber.pl,v $ # Revision 1.1.2.1 2004/02/19 10:14:36 tipaul # new feature : adding book to bookshelf from biblio detail screen. # # Local Variables: # tab-width: 4 # End: From tipaul at users.sourceforge.net Thu Feb 19 11:16:35 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:16:35 -0800 Subject: [Koha-cvs] CVS: koha/C4 Catalogue.pm,1.36.2.1,1.36.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22883/C4 Modified Files: Tag: rel_2_0 Catalogue.pm Log Message: #662 prepare/execute with (?) Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -C2 -r1.36.2.1 -r1.36.2.2 *** Catalogue.pm 13 Jan 2004 17:30:23 -0000 1.36.2.1 --- Catalogue.pm 19 Feb 2004 10:16:31 -0000 1.36.2.2 *************** *** 828,835 **** my ($searchstring)=@_; my $dbh = C4::Context->dbh; ! my $query="Select * from aqbooksellers where name like '$searchstring%' or ! id = '$searchstring'"; my $sth=$dbh->prepare($query); ! $sth->execute; my @results; my $i=0; --- 828,834 ---- my ($searchstring)=@_; my $dbh = C4::Context->dbh; ! my $query="Select * from aqbooksellers where name like ? or id =? "; my $sth=$dbh->prepare($query); ! $sth->execute("$searchstring%",$searchstring); my @results; my $i=0; From tipaul at users.sourceforge.net Thu Feb 19 11:15:44 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:15:44 -0800 Subject: [Koha-cvs] CVS: koha/C4 BookShelves.pm,1.11.2.1,1.11.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22735/C4 Modified Files: Tag: rel_2_0 BookShelves.pm Log Message: new feature : adding book to bookshelf from biblio detail screen. Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -r1.11.2.1 -r1.11.2.2 *** BookShelves.pm 6 Feb 2004 14:16:55 -0000 1.11.2.1 --- BookShelves.pm 19 Feb 2004 10:15:41 -0000 1.11.2.2 *************** *** 54,58 **** @ISA = qw(Exporter); ! @EXPORT = qw(&GetShelfList &GetShelfContents &AddToShelf &RemoveFromShelf &AddShelf &RemoveShelf); my $dbh = C4::Context->dbh; --- 54,59 ---- @ISA = qw(Exporter); ! @EXPORT = qw(&GetShelfList &GetShelfContents &AddToShelf &AddToShelfFromBiblio ! &RemoveFromShelf &AddShelf &RemoveShelf); my $dbh = C4::Context->dbh; *************** *** 86,104 **** # hash. sub GetShelfList { ! # FIXME - These two database queries can be combined into one: ! # SELECT bookshelf.shelfnumber, bookshelf.shelfname, ! # count(shelfcontents.itemnumber) ! # FROM bookshelf ! # LEFT JOIN shelfcontents ! # ON bookshelf.shelfnumber = shelfcontents.shelfnumber ! # GROUP BY bookshelf.shelfnumber ! my $sth=$dbh->prepare("select shelfnumber,shelfname from bookshelf"); $sth->execute; my %shelflist; ! while (my ($shelfnumber, $shelfname) = $sth->fetchrow) { ! my $sti=$dbh->prepare("select count(*) from shelfcontents where shelfnumber=?"); ! # FIXME - Should there be an "order by" in here somewhere? ! $sti->execute($shelfnumber); ! my ($count) = $sti->fetchrow; $shelflist{$shelfnumber}->{'shelfname'}=$shelfname; $shelflist{$shelfnumber}->{'count'}=$count; --- 87,99 ---- # hash. sub GetShelfList { ! my $sth=$dbh->prepare("SELECT bookshelf.shelfnumber, bookshelf.shelfname, ! count(shelfcontents.itemnumber) as count ! FROM bookshelf ! LEFT JOIN shelfcontents ! ON bookshelf.shelfnumber = shelfcontents.shelfnumber ! GROUP BY bookshelf.shelfnumber order by shelfname"); $sth->execute; my %shelflist; ! while (my ($shelfnumber, $shelfname,$count) = $sth->fetchrow) { $shelflist{$shelfnumber}->{'shelfname'}=$shelfname; $shelflist{$shelfnumber}->{'count'}=$count; *************** *** 157,160 **** --- 152,170 ---- } } + sub AddToShelfFromBiblio { + my ($env, $biblionumber, $shelfnumber) = @_; + return unless $biblionumber; + my $sth = $dbh->prepare("select itemnumber from items where biblionumber=?"); + $sth->execute($biblionumber); + my ($itemnumber) = $sth->fetchrow; + $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); + $sth->execute($shelfnumber, $itemnumber); + if ($sth->rows) { + # already on shelf + } else { + $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); + $sth->execute($shelfnumber, $itemnumber); + } + } =item RemoveFromShelf *************** *** 240,243 **** --- 250,256 ---- # # $Log$ + # Revision 1.11.2.2 2004/02/19 10:15:41 tipaul + # new feature : adding book to bookshelf from biblio detail screen. + # # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul # fixing bugs in bookshelves management. From tipaul at users.sourceforge.net Thu Feb 19 11:20:00 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:00 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.85.2.4,1.85.2.5 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23353/C4 Modified Files: Tag: rel_2_0 Search.pm Log Message: Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85.2.4 retrieving revision 1.85.2.5 diff -C2 -r1.85.2.4 -r1.85.2.5 *** Search.pm 6 Feb 2004 14:21:54 -0000 1.85.2.4 --- Search.pm 19 Feb 2004 10:19:57 -0000 1.85.2.5 *************** *** 1336,1340 **** if ($datedue eq ''){ # $datedue="Available"; ! my ($restype,$reserves)=CheckReserves($data->{'itemnumber'}); if ($restype){ $datedue=$restype; --- 1336,1340 ---- if ($datedue eq ''){ # $datedue="Available"; ! my ($restype,$reserves)=C4::Reserves2::CheckReserves($data->{'itemnumber'}); if ($restype){ $datedue=$restype; From tipaul at users.sourceforge.net Thu Feb 19 11:20:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl opac.html,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl Modified Files: Tag: rel_2_0 opac.html Log Message: Index: opac.html =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac.html 9 Apr 2003 08:40:28 -0000 1.2 --- opac.html 19 Feb 2004 10:20:21 -0000 1.2.2.1 *************** *** 6,10 ****
    ! WELCOME TO KOHA
    --- 6,14 ---- ! ! !
    ! WELCOME TO KOHA
    ! BIENVENUE DANS KOHA
    From tipaul at users.sourceforge.net Thu Feb 19 11:20:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple additem.tmpl,1.13.2.2,1.13.2.3 isbnsearch.tmpl,1.11.2.1,1.11.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: Tag: rel_2_0 additem.tmpl isbnsearch.tmpl Log Message: Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -C2 -r1.13.2.2 -r1.13.2.3 *** additem.tmpl 26 Jan 2004 10:46:36 -0000 1.13.2.2 --- additem.tmpl 19 Feb 2004 10:20:21 -0000 1.13.2.3 *************** *** 17,20 **** --- 17,21 ---- ">//images/fileopen.png"> ">Normal + ')">Print MARC biblio : *************** *** 123,126 **** --- 124,131 ---- newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } + function Doprint(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } + function confirm_deletion(bibid,itemnum) { var is_confirmed = confirm('Do you confirm item deletion ?'); Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -r1.11.2.1 -r1.11.2.2 *** isbnsearch.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 --- isbnsearch.tmpl 19 Feb 2004 10:20:21 -0000 1.11.2.2 *************** *** 4,8 **** You searched on ISBN title
    ! results found
    Results to displayed --- 4,8 ---- You searched on ISBN title
    ! results found
    Results to displayed From tipaul at users.sourceforge.net Thu Feb 19 11:20:25 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.8.2.2,1.8.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl/intranet-tmpl/default/en/acqui Modified Files: Tag: rel_2_0 newbiblio.tmpl Log Message: Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -r1.8.2.2 -r1.8.2.3 *** newbiblio.tmpl 26 Jan 2004 10:46:36 -0000 1.8.2.2 --- newbiblio.tmpl 19 Feb 2004 10:20:22 -0000 1.8.2.3 *************** *** 94,98 **** ! Format --- 94,98 ---- ! Item type From tipaul at users.sourceforge.net Thu Feb 19 11:21:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:21:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bookshelves - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23606/koha-tmpl/intranet-tmpl/default/en/bookshelves Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves added to the repository --> Using per-directory sticky tag `rel_2_0' From tipaul at users.sourceforge.net Thu Feb 19 11:22:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:22:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23787/koha-tmpl/intranet-tmpl/default/en/bookshelves Added Files: Tag: rel_2_0 addbookbybiblionumber.tmpl Log Message: new feature : adding book to bookshelf from biblio detail screen. --- NEW FILE ---

    "> Title :
    Author :
    Add to virtual shelf :
    From tipaul at users.sourceforge.net Thu Feb 19 11:22:50 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:22:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.14.2.1,1.14.2.2 searchresults.tmpl,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23866/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 MARCdetail.tmpl searchresults.tmpl Log Message: new feature : adding book to bookshelf from biblio detail screen. Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -r1.14.2.1 -r1.14.2.2 *** MARCdetail.tmpl 10 Feb 2004 13:17:57 -0000 1.14.2.1 --- MARCdetail.tmpl 19 Feb 2004 10:22:46 -0000 1.14.2.2 *************** *** 20,23 **** --- 20,24 ---- ">Normal ')">Print + ')">Add to shelf MARC biblio : Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** searchresults.tmpl 26 Jan 2004 10:46:35 -0000 1.7.2.1 --- searchresults.tmpl 19 Feb 2004 10:22:46 -0000 1.7.2.2 *************** *** 55,59 **** ! >Request --- 55,63 ---- ! ! >Request ! ! Not Reservable ! From tipaul at users.sourceforge.net Thu Feb 19 11:24:19 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:24:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_60X.tmpl,1.2,1.2.2.1 unimarc_field_700_701_702.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24105/koha-tmpl/intranet-tmpl/default/en/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: textarea 5 lines instead of 10 Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** unimarc_field_60X.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- unimarc_field_60X.tmpl 19 Feb 2004 10:24:17 -0000 1.2.2.1 *************** *** 23,29 ****
    !
    !

    Recherche

    A B --- 23,29 ---- !
    !

    Search

    A B Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700_701_702.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** unimarc_field_700_701_702.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- unimarc_field_700_701_702.tmpl 19 Feb 2004 10:24:17 -0000 1.2.2.1 *************** *** 6,10 **** !

    "> "> --- 6,11 ---- !
    !

    "> "> *************** *** 14,18 **** "> "> !

    --- 15,19 ---- "> "> ! *************** *** 23,27 **** "> ! --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:24:40 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:24:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en thesaurus_popup.tmpl,1.4.2.1,1.4.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24149/koha-tmpl/intranet-tmpl/default/en Modified Files: Tag: rel_2_0 thesaurus_popup.tmpl Log Message: textarea 5 lines instead of 10 Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** thesaurus_popup.tmpl 26 Jan 2004 10:46:35 -0000 1.4.2.1 --- thesaurus_popup.tmpl 19 Feb 2004 10:24:32 -0000 1.4.2.2 *************** *** 5,9 ****
    !

    --- 5,9 ---- !

    *************** *** 24,28 **** "> !

    --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue searchresults.tmpl,1.2.2.4,1.2.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: Tag: rel_2_0 searchresults.tmpl Log Message: french version of previous commits Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -r1.2.2.4 -r1.2.2.5 *** searchresults.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 --- searchresults.tmpl 19 Feb 2004 10:26:06 -0000 1.2.2.5 *************** *** 55,59 **** ! >Réservation --- 55,63 ---- ! ! >Réservation ! ! Not Reservable ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr thesaurus_popup.tmpl,1.3.2.3,1.3.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr Modified Files: Tag: rel_2_0 thesaurus_popup.tmpl Log Message: french version of previous commits Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** thesaurus_popup.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.3 --- thesaurus_popup.tmpl 19 Feb 2004 10:26:04 -0000 1.3.2.4 *************** *** 5,9 ****
    !

    --- 5,9 ---- !

    *************** *** 24,28 **** "> !

    --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_60X.tmpl,1.2.2.3,1.2.2.4 unimarc_field_700_701_702.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: french version of previous commits Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** unimarc_field_60X.tmpl 10 Feb 2004 14:07:44 -0000 1.2.2.3 --- unimarc_field_60X.tmpl 19 Feb 2004 10:26:06 -0000 1.2.2.4 *************** *** 23,29 ****
    !
    !

    Recherche

    A B --- 23,29 ---- !
    !

    Chercher

    A B Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** unimarc_field_700_701_702.tmpl 10 Feb 2004 14:07:44 -0000 1.1.2.3 --- unimarc_field_700_701_702.tmpl 19 Feb 2004 10:26:06 -0000 1.1.2.4 *************** *** 6,10 **** !

    "> "> --- 6,11 ---- !
    !

    "> "> *************** *** 14,18 **** "> "> !

    --- 15,19 ---- "> "> ! *************** *** 23,27 **** "> ! --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui newbiblio.tmpl,1.5.2.4,1.5.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: Tag: rel_2_0 newbiblio.tmpl Log Message: french version of previous commits Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -C2 -r1.5.2.4 -r1.5.2.5 *** newbiblio.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.4 --- newbiblio.tmpl 19 Feb 2004 10:26:07 -0000 1.5.2.5 *************** *** 3,7 **** --- 94,98 ---- ! Catég ouvrage *************** *** 115,119 **** Quantité ! " onchange='mettre à jour(this.form)' > --- 115,119 ---- Quantité ! " onchange='update(this.form)' > *************** *** 123,143 **** Prix catalogue du fournisseur ! " onchange='mettre à jour(this.form)'> Frais Remplacement
    ! " onchange='mettre à jour(this.form)'> Coûts budgetés
    (ex TVA, remise) ! " onchange='mettre à jour(this.form)'> GST budgeté ! TOTAL BUDGETE ! --- 123,143 ---- Prix catalogue du fournisseur ! " onchange='update(this.form)'> Frais Remplacement
    ! " onchange='update(this.form)'> Coûts budgetés
    (ex TVA, remise) ! " onchange='update(this.form)'> GST budgeté ! TOTAL BUDGETE ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple additem.tmpl,1.5.2.4,1.5.2.5 isbnsearch.tmpl,1.2.2.4,1.2.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: Tag: rel_2_0 additem.tmpl isbnsearch.tmpl Log Message: french version of previous commits Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -C2 -r1.5.2.4 -r1.5.2.5 *** additem.tmpl 28 Jan 2004 16:44:57 -0000 1.5.2.4 --- additem.tmpl 19 Feb 2004 10:26:07 -0000 1.5.2.5 *************** *** 17,20 **** --- 17,21 ---- ">//images/fileopen.png"> ">Normal + ')">Imprimer Notice biblio MARC : *************** *** 123,126 **** --- 124,131 ---- newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=oui'); } + function Doprint(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } + function confirm_deletion(bibid,itemnum) { var is_confirmed = confirm('Do you confirm item deletion ?'); Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -r1.2.2.4 -r1.2.2.5 *** isbnsearch.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 --- isbnsearch.tmpl 19 Feb 2004 10:26:07 -0000 1.2.2.5 *************** *** 4,8 **** Recherche effectuée sur ISBN title
    ! Résultats trouvés
    Résultats to affiché --- 4,8 ---- Recherche effectuée sur ISBN title
    ! Résultats trouvés
    Résultats to affiché From tipaul at users.sourceforge.net Thu Feb 19 11:26:41 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.fr,1.1.2.5,1.1.2.6 opac-css.fr,1.1.2.5,1.1.2.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24520/misc/translator Modified Files: Tag: rel_2_0 intranet.fr opac-css.fr Log Message: french translation file update Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** intranet.fr 10 Feb 2004 13:51:38 -0000 1.1.2.5 --- intranet.fr 19 Feb 2004 10:26:36 -0000 1.1.2.6 *************** *** 6,11 **** Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE - ACQUISITIONS ACQUISITIONS Acquisitions Acquisitions action=modrequest.pl method=post> ***** Active Actif --- 6,11 ---- Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE Acquisitions Acquisitions + ACQUISITIONS ACQUISITIONS action=modrequest.pl method=post> ***** Active Actif *************** *** 28,33 **** Add criteria Ajouter un critère Add currency Ajouter une monnaie - Add item Ajouter un ouvrage Add Item Ajouter un ouvrage Add item type Ajouter catégorie d'ouvrage Add member Ajouter un lecteur --- 28,33 ---- Add criteria Ajouter un critère Add currency Ajouter une monnaie Add Item Ajouter un ouvrage + Add item Ajouter un ouvrage Add item type Ajouter catégorie d'ouvrage Add member Ajouter un lecteur *************** *** 82,87 **** Alternative Phone Autre téléphone Ambrose Li ***** - Amount Montant AMOUNT MONTANT AMOUNT OWING Montant de l'avoir An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table Une "valeur autorisée": se réfère à une liste de valeurs autorisées pour ce sous-champs. Voir la table admin correspondante. --- 82,87 ---- Alternative Phone Autre téléphone Ambrose Li ***** AMOUNT MONTANT + Amount Montant AMOUNT OWING Montant de l'avoir An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table Une "valeur autorisée": se réfère à une liste de valeurs autorisées pour ce sous-champs. Voir la table admin correspondante. *************** *** 120,125 **** BARCODE CODE BARRE Barcode Code barre - BASKET PANIER Basket Panier Baycorp Adjustment ***** be in tab -1 être dans l'onglet -1 (items) --- 120,125 ---- BARCODE CODE BARRE Barcode Code barre Basket Panier + BASKET PANIER Baycorp Adjustment ***** be in tab -1 être dans l'onglet -1 (items) *************** *** 129,133 **** Become a Member S'inscrire Benedykt P. Barszcz (polish for 2.0 ***** - Benedykt P. Barszcz (polish for 2.0) UNUSED;1 Between Brothers by Irene Morck at Main Library ***** bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ***** --- 129,132 ---- *************** *** 153,161 **** Bookfund admin Admin Compte Bookshelves Rayonnages - Borrower Emprunteur borrower emprunteur Borrower categories Catégories d'emprunteurs - Borrower information Informations emprunteur Borrower Information Informations Emprunteur Borrowernumber N° Lecteur BORROWERS EMPRUNTEURS --- 152,160 ---- Bookfund admin Admin Compte Bookshelves Rayonnages borrower emprunteur + Borrower Emprunteur Borrower categories Catégories d'emprunteurs Borrower Information Informations Emprunteur + Borrower information Informations emprunteur Borrowernumber N° Lecteur BORROWERS EMPRUNTEURS *************** *** 174,179 **** Budget amount Montant budget budgetamount LIMITED;budgetamount ! Budgeted Cost Coûts budgetés ! Budgeted GST GST budgeté BUDGETED TOTAL TOTAL BUDGETE Budgets Budgets --- 173,178 ---- Budget amount Montant budget budgetamount LIMITED;budgetamount ! Budgeted Cost Coûts budgétés ! Budgeted GST TVA budgétée BUDGETED TOTAL TOTAL BUDGETE Budgets Budgets *************** *** 295,300 **** Define the categories of borrowers Définir catégories d'emprunteurs Del Suppr. - delete LIMITED;supprimer Delete LIMITED;Supprimer Delete a request by selecting "del" from the rank list Supprimer une demande en sélectionnant "suppr." dans la liste Delete Shelves Supprimer Rayonnages --- 294,299 ---- Define the categories of borrowers Définir catégories d'emprunteurs Del Suppr. Delete LIMITED;Supprimer + delete LIMITED;supprimer Delete a request by selecting "del" from the rank list Supprimer une demande en sélectionnant "suppr." dans la liste Delete Shelves Supprimer Rayonnages *************** *** 339,344 **** Enter Book Barcode Entrer Code barre du livre Enter borrower card number Entrer N° carte de lecteur - Error Erreur ERROR ERREUR ERROR : Barcode already exists ! ERREUR: Code barre existe déjà! Error Issuing Book Erreur prêt d'un livre --- 338,343 ---- Enter Book Barcode Entrer Code barre du livre Enter borrower card number Entrer N° carte de lecteur ERROR ERREUR + Error Erreur ERROR : Barcode already exists ! ERREUR: Code barre existe déjà! Error Issuing Book Erreur prêt d'un livre *************** *** 347,358 **** Ethnicity Notes Notes appartenance ethnique ex GST, inc discount ex TVA, remise - exact exact Exact Exact EXCHANGE RATES TAUX DE CHANGE Existing items Ouvrages existant Expiry Date Date d'expiration Explanation Explication - export LIMITED;exporter Export LIMITED;Exporter Export in MARC format the following biblios Exporter en format MARC les les biblios suivants Exporting in MARC format Exporter en format MARC --- 346,357 ---- Ethnicity Notes Notes appartenance ethnique ex GST, inc discount ex TVA, remise Exact Exact + exact exact EXCHANGE RATES TAUX DE CHANGE Existing items Ouvrages existant Expiry Date Date d'expiration Explanation Explication Export LIMITED;Exporter + export LIMITED;exporter Export in MARC format the following biblios Exporter en format MARC les les biblios suivants Exporting in MARC format Exporter en format MARC *************** *** 367,372 **** FINES & CHARGES AMENDES & FRAIS Firstname Prénom - FLAGS DRAPEAUX Flags Drapeaux Florian Bischof ***** for LIMITED;pour --- 366,371 ---- FINES & CHARGES AMENDES & FRAIS Firstname Prénom Flags Drapeaux + FLAGS DRAPEAUX Florian Bischof ***** for LIMITED;pour *************** *** 393,398 **** GROUP - GROUP - Group Number N° Groupe ! GST GST ! GST Registered GST enregistré Guarantees Garanties Guarantor Garant --- 392,397 ---- GROUP - GROUP - Group Number N° Groupe ! GST TVA ! GST Registered TVA à payer Guarantees Garanties Guarantor Garant *************** *** 443,447 **** Invalid cardnumber N° carte invalide Invoice Facture ! Invoice Item Price Includes GST Prix de la facture de l'ouvrage inclus le GST Invoice Number N° facture Invoice Prices are Prix facturés sont --- 442,446 ---- Invalid cardnumber N° carte invalide Invoice Facture ! Invoice Item Price Includes GST Prix de la facture de l'ouvrage inclus la TVA Invoice Number N° facture Invoice Prices are Prix facturés sont *************** *** 458,462 **** Issuing Question Question sur le prêt Item Ouvrage - Item () UNUSED;Ouvrage Item added with barcode Ouvrage ajouté avec un code barre Item Barcode Code barre d'un ouvrage --- 457,460 ---- *************** *** 472,476 **** Item types Categ. ouvrages Item waiting at Ouvrage en attente à - Item: () UNUSED;Ouvrage ItemNotes Notes ouvrage itemnum IGNORE --- 470,473 ---- *************** *** 530,538 **** Links Koha - MARC DB Liens Koha - base de données MARC Links to Associated Websites Liens vers des sites Web associés ! List Item Price Includes GST Prix catalogue de l'ouvrage inclus le GST List Prices are Prix catalogue sont Loan length Durée de prêt - Location Localisation LOCATION LOCALISATION Log In S'identifier Log Out Déconnecter --- 527,535 ---- Links Koha - MARC DB Liens Koha - base de données MARC Links to Associated Websites Liens vers des sites Web associés ! List Item Price Includes GST Prix catalogue de l'ouvrage inclus la TVA List Prices are Prix catalogue sont Loan length Durée de prêt LOCATION LOCALISATION + Location Localisation Log In S'identifier Log Out Déconnecter *************** *** 588,599 **** Michaes Herman ***** Michel Lerenard (Esiee School ***** - Michel Lerenard (Esiee School) UNUSED;1 Mike Hansen ***** Mike Johnson ***** Mike Mylonas ***** MJ Ray and Turo Technology LLP, england (quality control, installer & updater ***** - MJ Ray and Turo Technology LLP, england (quality control, installer & updater) UNUSED;1 - Modify Modifier modify modifier Modify a system preference Modifier une préférence système Modify category Modifier Catégorie --- 585,594 ---- Michaes Herman ***** Michel Lerenard (Esiee School ***** Mike Hansen ***** Mike Johnson ***** Mike Mylonas ***** MJ Ray and Turo Technology LLP, england (quality control, installer & updater ***** modify modifier + Modify Modifier Modify a system preference Modifier une préférence système Modify category Modifier Catégorie *************** *** 647,652 **** No. of Items Nombre d'ouvrages Non-Fiction Documentaire - normal normal Normal Normal Not for loan Non empruntable not imported because already in DB pas importé, car déjà existant dans la base de données --- 642,647 ---- No. of Items Nombre d'ouvrages Non-Fiction Documentaire Normal Normal + normal normal Not for loan Non empruntable not imported because already in DB pas importé, car déjà existant dans la base de données *************** *** 654,657 **** --- 649,653 ---- not imported because they seems not to be MARC format (or ISBN/ISSN missing) ! pas importé, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) ! Not on Issue Pas en prêt + Not Reservable ***** Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night Note : les amendes sont calculées par le misc/script fines2.pl. Demandez à votre administrateur de mettre ce script dans le crontab, après minuit, pour que les amendes soient calculées chaque nuit NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script Note : si vous changez quelque chose dans cette table, demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl *************** *** 659,664 **** Note : the items are NOT exported by this tool Note: les ouvrages en sont PAS exportés par cet outil Note: in the last column, you can choose Note: dans la dernière colonne, vous pouvez choisir - NOTES NOTES Notes Notes nothing entered pas de saisie Nothing found Rien trouvé --- 655,660 ---- Note : the items are NOT exported by this tool Note: les ouvrages en sont PAS exportés par cet outil Note: in the last column, you can choose Note: dans la dernière colonne, vous pouvez choisir Notes Notes + NOTES NOTES nothing entered pas de saisie Nothing found Rien trouvé *************** *** 677,682 **** opac opac options >>   ***** - or ou OR OU OR Add to a new Group ou ajouter à un nouveau groupe OR MODIFY DETAILS ou modifie les détails --- 673,678 ---- opac opac options >>   ***** OR OU + or ou OR Add to a new Group ou ajouter à un nouveau groupe OR MODIFY DETAILS ou modifie les détails *************** *** 750,755 **** Publisher Editeur Publishers and Imprints Edition - QTY QUANTITE Qty Quantité Quantity Quantité Quantity Ordered Quantité commandée --- 746,751 ---- Publisher Editeur Publishers and Imprints Edition Qty Quantité + QTY QUANTITE Quantity Quantité Quantity Ordered Quantité commandée *************** *** 767,771 **** Receive Orders From Supplier Réceptionner commandes d'un fournisseur Received By Reçu par - Recherche ***** Recieved Reçu Record already in database Notice déjà existante --- 763,766 ---- *************** *** 792,799 **** Replacement Price Prix Remplacement Reporter Reporter - Reports LIMITED;Rapports reports LIMITED;rapports ! request LIMITED;Réservation Request LIMITED;Réservation Requested Reservé Requesting Reserve --- 787,794 ---- Replacement Price Prix Remplacement Reporter Reporter reports LIMITED;rapports ! Reports LIMITED;Rapports Request LIMITED;Réservation + request LIMITED;Réservation Requested Reservé Requesting Reserve *************** *** 819,824 **** Ron Wickersham ***** Rosalie Blake, Head of Libraries ***** - Save Enregistrer save Enregistrer Save Changes Enregistrer changements School Ecole --- 814,819 ---- Ron Wickersham ***** Rosalie Blake, Head of Libraries ***** save Enregistrer + Save Enregistrer Save Changes Enregistrer changements School Ecole *************** *** 872,876 **** SELECTED>traducteur ***** Serial Périodiques ! Series Séries Series Title Titre Séries Servers to query for MARC data serveurs à interroger pour des données MARC --- 867,871 ---- SELECTED>traducteur ***** Serial Périodiques ! Series Titre périodique ou collection Series Title Titre Séries Servers to query for MARC data serveurs à interroger pour des données MARC *************** *** 938,943 **** Tag LIMITED;Etiquette Teacher Reference Référence Enseignant - test test Test Test Text messaging Ecriture d'un texte Text Messaging Ecriture d'un texte --- 933,938 ---- Tag LIMITED;Etiquette Teacher Reference Référence Enseignant Test Test + test test Text messaging Ecriture d'un texte Text Messaging Ecriture d'un texte *************** *** 979,984 **** TITLE TITRE Title Search Recherche Titre - to ***** To LIMITED;à To "unmap", click ==> Pour "déconnecter" cliquer ==> To add a new biblio/item, scan or type the ISBN/ISSN number Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN. --- 974,979 ---- TITLE TITRE Title Search Recherche Titre To LIMITED;à + to ***** To "unmap", click ==> Pour "déconnecter" cliquer ==> To add a new biblio/item, scan or type the ISBN/ISSN number Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN. *************** *** 996,1001 **** Total Total TOTAL TOTAL - Total Due Total dû Total due Total dû Total Number of Items Nombre total d'ouvrages Total paid Total payé --- 991,996 ---- Total Total TOTAL TOTAL Total due Total dû + Total Due Total dû Total Number of Items Nombre total d'ouvrages Total paid Total payé *************** *** 1014,1019 **** unimarc_field_700_701_702.pl ***** Unititle Titre uniforme ! Update Mettre à jour ! update mettre à jour Update Member Details Mise à jour du lecteur Update this Website Link Corriger ce lien Internet --- 1009,1014 ---- unimarc_field_700_701_702.pl ***** Unititle Titre uniforme ! update LIMITED;mettre à jour ! Update LIMITED;Mettre à jour Update Member Details Mise à jour du lecteur Update this Website Link Corriger ce lien Internet *************** *** 1048,1053 **** Volume Description Description Volume Volume Info (for serials Info Volume (pour périodiques - WAITING EN ATTENTE Waiting En attente Website Site Web Website Biblioitem Added Notice site Web ajoutée --- 1043,1048 ---- Volume Description Description Volume Volume Info (for serials Info Volume (pour périodiques Waiting En attente + WAITING EN ATTENTE Website Site Web Website Biblioitem Added Notice site Web ajoutée *************** *** 1063,1068 **** Year Année Yes Oui - yes oui YES OUI Yes, See below Oui, voir plus bas YesNo OuiNon --- 1058,1063 ---- Year Année Yes Oui YES OUI + yes oui Yes, See below Oui, voir plus bas YesNo OuiNon *************** *** 1077,1082 **** You must create a new group for your item to be added to Vous devez créer un nouveau groupe pour ajouter vos ouvrages You must give the item a barcode Vous devez attribuer un code barre à l'ouvrage - You searched for Votre recherche sur You Searched for Votre recherche sur You searched on Recherche effectuée sur Young Adult Fiction Fiction Ados --- 1072,1077 ---- You must create a new group for your item to be added to Vous devez créer un nouveau groupe pour ajouter vos ouvrages You must give the item a barcode Vous devez attribuer un code barre à l'ouvrage You Searched for Votre recherche sur + You searched for Votre recherche sur You searched on Recherche effectuée sur Young Adult Fiction Fiction Ados Index: opac-css.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac-css.fr,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** opac-css.fr 10 Feb 2004 09:02:53 -0000 1.1.2.5 --- opac-css.fr 19 Feb 2004 10:26:37 -0000 1.1.2.6 *************** *** 97,101 **** normal normal Normal or Normal ou ! Not Reservable Non réservable Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used Notez que le mot clef est prioritaire Note there will be a reserve charge of Il y aura des frais de réservation de --- 97,101 ---- normal normal Normal or Normal ou ! Not Reservable A consulter sur place Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used Notez que le mot clef est prioritaire Note there will be a reserve charge of Il y aura des frais de réservation de From oleonard at users.sourceforge.net Thu Feb 19 19:56:24 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:56:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27625/npl Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:57:10 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:57:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27745/en Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/acqui Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/acqui.simple Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/catalogue Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/includes Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/parameters Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/circ Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:11 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/user - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/user Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/user added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/marcimport - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/marcimport Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/reports Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/import - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/import Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:11 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/value_builder - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/value_builder Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/members Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:12 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/search.marc Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:12 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/z3950 - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/z3950 Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/export - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/export Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:59:39 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:59:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,NONE,1.1 acquire.tmpl,NONE,1.1 basket.tmpl,NONE,1.1 newbasket.tmpl,NONE,1.1 newbasket2.tmpl,NONE,1.1 newbiblio.tmpl,NONE,1.1 order.tmpl,NONE,1.1 recieve.tmpl,NONE,1.1 recieveorder.tmpl,NONE,1.1 supplier.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28315/koha-tmpl/intranet-tmpl/npl/en/acqui Added Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket.tmpl newbasket2.tmpl newbiblio.tmpl order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl Log Message: New NPL templates --- NEW FILE ---

    Acquisitions

    Start, Recieve, or Modify Any Order
    Receive or Modify a Periodical Order
    Exchange Rates
    " name="" value="">
    Budgets and Bookfunds
    Budgets Total Spent Comtd Avail
    Total

    Use your reload button [ctrl + r] to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.

    Help

    To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

    To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

    To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

    To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

    --- NEW FILE ---

    Receipt Summary for : Invoice,

    • Invoice:
    • Received By:
    • Date:

    - Receive Order

    • Shopping Basket For:
    • Order placed:
    Catalogue Details
    Title * " >
    Author " >
    Copyright Date " >
    Format
    ISBN ">
    Series ">
    Branch
    Item Barcode * ">
    Volume Info (for serials) *
    "> "> "> "> "> "> &id=">Edit
    Accounting Details
    Bookfund *
    Quantity Ordered ">
    Quantity Received * ">
    Replacement Cost ">
    Budgeted Cost ">
    Actual Cost * ">
    Invoice Number ">
    Notes ">
    Basket ISBN Title Author Qty Received
    &biblio=&invoice=&freight=&gst=&id=">
    --- NEW FILE ---

    Shopping Basket for ">

    (Our Reference: , #, authorised by: )

    "> " /> " />
    Order Isbn Title Author $ rrp $est Qty Total
    &id=&basket=">
    HELP

    To change any of the catalogue or accounting information attached to an order, click on the title.

    		 SubTotal
    GST
    TOTAL

    " /> " /> Add order : enter keyword or title:

    --- NEW FILE --- Shopping Basket for
    (Our Reference: , #, authorised by: )
    Ph: , Fax:
    ,
    ,

    "> "> Search Keyword or Title:
    >
    Order Isbn Title Author Qty
    --- NEW FILE ---

    Shopping Basket For:

    &basket=&sub=">Add New Biblio &basket=&sub=">Add New Biblio | ">View Basket |
    " /> " /> New Search:

    You searched for

    --- NEW FILE ---
    --> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />

    - Order Details

    Shopping Basket For:

    ">View Basket
    Catalogue Details
    Title * " />
    Author " />
    Copyright Date " />
    Format
    ISBN ">
    Series ">
    Branch
    Accounting Details
    Quantity " onchange="update(this.form)" />
    Bookfund
    Suppliers List Price " onchange="update(this.form)" />
    Replacement Cost
    		" onchange="update(this.form)" />
    Budgeted Cost
    (ex GST, inc discount)     		" onchange="update(this.form)" />
    Budgeted GST
    BUDGETED TOTAL
    Actual Cost
    Invoice Number *
    Notes " />

    HELP

    • Bold fields must be filled in to create a new bibilo and item.

    • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.
    --- NEW FILE ---
    You searched on supplier , results found
    Supplier Search Results
    Order Receive Company
    Basket Items Staff Date
    /images/mail_send.png" title="Add order" ALT="Add" border="0" > /images/mail_get.png" title="receive" ALT="Add" border="0" >
    ">
    --- NEW FILE ---

    Receipt Summary for : , Invoice

    • Invoice:
    • Received By:
    • Date:
    " /> " /> " /> " /> Search ISBN or Title:
    Basket ISBN Title Author Actual P&P Qty Total
    &biblio=&invoice=&gst=&freight=&id="> $   $
          Subtotals $ $
    HELP

    The total at the bottom of the page should be within a few cents of the total for the invoice.

    When you have finished this invoice save the changes.

    		 GST $
      TOTAL $
    --- NEW FILE ---

    Receive Orders From Supplier

    " />
    Supplier Invoice Information
    Supplier Invoice Number
    GST
    Freight
    --- NEW FILE ---
    >

    Update:

    Add supplier

    Company Details
    " />
    " />
    " />
    " />
    Contact Details
    " />
    " />
    " />
    " />
    " />
    " />
    Current Status
    checked="checked" />Active checked="checked" />Inactive
    Ordering Information
    checked="checked" />Yes checked="checked" />No
    checked="checked" />Yes checked="checked" />No
    checked="checked" />Yes checked="checked" />No
    " /> %
    From oleonard at users.sourceforge.net Thu Feb 19 20:02:15 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:02:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,NONE,1.1 catalogue-home.tmpl,NONE,1.1 cmsdsearchresults.tmpl,NONE,1.1 detail-opac.tmpl,NONE,1.1 detail.tmpl,NONE,1.1 detailprint.tmpl,NONE,1.1 moredetail.tmpl,NONE,1.1 searchresults.tmpl,NONE,1.1 subject.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28745/koha-tmpl/intranet-tmpl/npl/en/catalogue Added Files: MARCdetail.tmpl catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl detailprint.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Log Message: New NPL templates --- NEW FILE --- --- NEW FILE ---

    Catalogue Search

    Search by Number

    Barcode
    ISBN

    Search by Details

    Keywords
    Title
    Author
    Collection
    Branch
    Pub Date(before) (after)
    Search TypeNormal Exact

    Search by Subject

    Subject
    --- NEW FILE --- Search Results
    TitleAuthorDewey
    &startfrom=>Previous Records &startfrom=>Next Records

    Results through of records.
    --- NEW FILE --- ()

    BIBLIO RECORD

    Subtitle:
    Author:
    Additional Author:
    Series Title:
    Subject:
    Copyright:
    Notes:
    Unititle:
    Serial:
    Total Number of Items:

    Item Type Class Location Date Due Last Seen
    Website Online Available &bib=&bi=">http://


    --- NEW FILE ---

    .jpg" alt="Book Cover Image" />

    ()

    Biblio Record

    " />
    " />" />" />" />
    " name="bib" />
    • Subtitle:
    • Author: ">
    • Additional Author:
    • ISBN:
    • Series Title:
    • Copyright:
    • Notes:
    • Unititle:
    • Serial:
    • Total Number of Items:
    • Subject: ">
      -->
    Item Type Call Number Location Date Due Last Seen Barcode
    "> -->  &item=&bib=&bi=#"> &item=">Fix Itemtype
    Website Online Available &bib=&bi=">http://

    Links to Associated Websites
    Title:
    Description:
    URL:">http://
    -->

    --- NEW FILE ---
      
    Biblio Record Number:
    Author:
    Additional Author:
    Publisher:
    Publication Details: , ,
    Collection:
    Subject:
    Copyright Date:
    Notes:
    Unititle:
    Dewey: ">
    Classification:
    LCCN:
    URL: ">
    ISBN:
    Item TypeBranchBarcode
    ,  
    --- NEW FILE ---

    ()

    Biblio Number:

    Category:

    " name="bib" />
    " />
    -->
    Bibliographic Details
    Biblionumber:
    Item Type:
    URL: -->
    Loan Length:
    Classification:
    ISBN:
    Publisher:
    Place:
    Date:
    Volume:
    Pages:
    Illus:
    Size:
    Notes:
    No. of Items:
    " id="">

    Barcode:

    Home Branch:
    Last seen:
    On loan to:
    Last borrowed:
    Last Borrower 1: ">
    Last Borrower 2: ">
    Current Branch:
    Replacement Price:
    &item=&type=">Item lost:
    Paid for:
    Notes:
    Renewals:
    &biblio=&invoice=&catview=yes"> Accession Date:
    Withdrawn:
    &bi=&itm=">Total Issues: 
    Group Number:
    Biblio number:
    --- NEW FILE ---

    You searched for You did not specify any seach criteria

     
    Results through of records.
    TitleAuthor©Call NumberItem CountLocation  
    opacintra&bib="> () &type=opacintra">          ">Reserves
    &=&type=opacintra"><<Prev   &=&type=opacintra">   &=&type=opacintra">Next >>  
    Results through of records. Try another search
    Try another search
    --- NEW FILE ---
    Results through of records.
    Subject
    opacintra&subjectitems=">
    "><< Previous Records &startfrom=">Next Records >>
    Results through of records.
    From oleonard at users.sourceforge.net Thu Feb 19 20:03:01 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:03:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,NONE,1.1 circulation.tmpl,NONE,1.1 returns.tmpl,NONE,1.1 selectbranchprinter.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28887/koha-tmpl/intranet-tmpl/npl/en/circ Added Files: branchtransfers.tmpl circulation.tmpl returns.tmpl selectbranchprinter.tmpl Log Message: New NPL templates --- NEW FILE --- Koha -- Circulation: Transfers

    Circulation: Transfers

    Reserve Found

    Reserve found for (" onclick="openWindow(this,'Member', 480, 640)">). Item is marked waiting at for (" onclick="openWindow(this,'Member', 480, 640)">).
    Set reserve to waiting and transfer book to : Cancel reservation and then attempt transfer:
    " value="" /> " value="" /> " value="" /> " /> " /> " />
    Cancel reservation and then attempt transfer:
    " value="" /> " value="" /> " value="" /> " /> " /> " /> />
    Ignore and return to transfers:
    /> " value="" /> " value="" /> " value="" />
    Messages
    Reserve Cancelled
    Item should now be waiting at branch:
    No Item with barcode: Please return item to home branch: Item is already at destination branch. Item was on loan to " onClick="openWindow(this,'Member', 480, 640)"> and has been returned.

    Transfer

    Destination Branch:
    Enter Book Barcode
    " /> " value="" /> " value="" /> " value="" />
    Transfered Items
    Bar CodeTitleAuthorTypeFromTo
    &type=intra" onclick="openWindow(this, 'Item', 480, 640)">
    --- NEW FILE ---

    Circulation: Issues

    Issuing Question

    Attempting to issue by to .

    " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />
    " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />

    Error Issuing Book

    Add a new patron

    " /> " />

    Patron not found? Add a new patron

    " /> " />

    ()


    Reserves waiting:
    Notes:
    > Sticky Due Date --> " /> " /> " /> " />
    " />
    Issues ">(Print Page) ">(Print Slip)
    Due DateTitleAuthorCall NoBarcodeRenew?
    &type=intra"> " value="y" />
    &type=intra"> " value="y" />

    " />" value="y" />
    --- NEW FILE --- Koha -- Circulation: Returns:

    Reserve Found (item is already marked waiting)

    ">
    Patron:
    Transfer to:
    " value="" /> " value="" /> " value="" />

    Item marked Waiting:


    ">
    Patron:
    " value="" /> " value="" /> " value="" />
    ">
    Patron:
    Transfer to:
    " value="" /> " value="" /> " value="" /> " /> " /> " />

    Circulation: Returns

    " value="" /> " value="" /> " value="" />
    No Item with barcode: Please return to Not On Issue. Item was lost, now found. Item Cancelled
    Item InformationBorrower Information
    "> , ( , )
    Returned Items
    Due DateBar CodeTitleAuthorTypeBorrower
    // Not on Issue. &type=intra"> ">
    --- NEW FILE --- Koha -- Circulation: Select Your Home Branch

    Circulation: Select Your Home Branch

    From oleonard at users.sourceforge.net Thu Feb 19 20:06:48 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:06:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/export marc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/koha-tmpl/intranet-tmpl/npl/en/export Added Files: marc.tmpl Log Message: New NPL templates --- NEW FILE ---

    MARC Export

    Export in MARC format the following biblios:

    From biblio number: to biblio number:

    (leave blank to export every biblio)

    Note : the items are NOT exported by this tool

    From oleonard at users.sourceforge.net Thu Feb 19 20:08:20 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:08:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/import breeding.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29888/koha-tmpl/intranet-tmpl/npl/en/import Added Files: breeding.tmpl Log Message: New NPL templates --- NEW FILE ---

    MARC acquisition system

    Import into the breeding farm

    Import results :

    • imported records
    • not imported because already in DB
    • not imported because already in farm
    • not imported because they seems not to be MARC format (or ISBN/ISSN missing) !
    • records parsed
    • Back
    • 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.
    • If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.
    • You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!
    • Of course, if the ISBN already exists in the active DB, the biblio will be ignored.
    " enctype="multipart/form-data">

    If ISBN already in breeding farm: Ignore this one, keep the existing one
    Overwrite the existing one with this
    From oleonard at users.sourceforge.net Thu Feb 19 20:11:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:11:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes admin-topmenu.inc,NONE,1.1 circ-topmenu.inc,NONE,1.1 doc-head-circ-close.inc,NONE,1.1 doc-head-circ-open.inc,NONE,1.1 intranet-bottom.inc,NONE,1.1 intranet-nav-brief.inc,NONE,1.1 intranet-nav.inc,NONE,1.1 intranet-topmenu.inc,NONE,1.1 intranet.css,NONE,1.1 itemtypes.js,NONE,1.1 main-top-addbiblio.inc,NONE,1.1 main-top-blank.inc,NONE,1.1 main-top-circ.inc,NONE,1.1 main-top-print.inc,NONE,1.1 main-top.inc,NONE,1.1 masthead.inc,NONE,1.1 members-topmenu.inc,NONE,1.1 print.css,NONE,1.1 rollovers.js,NONE,1.1 tabs.css,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30391/koha-tmpl/intranet-tmpl/npl/en/includes Added Files: admin-topmenu.inc circ-topmenu.inc doc-head-circ-close.inc doc-head-circ-open.inc intranet-bottom.inc intranet-nav-brief.inc intranet-nav.inc intranet-topmenu.inc intranet.css itemtypes.js main-top-addbiblio.inc main-top-blank.inc main-top-circ.inc main-top-print.inc main-top.inc masthead.inc members-topmenu.inc print.css rollovers.js tabs.css Log Message: New NPL templates --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- </body> </html> --- NEW FILE --- <div id="nav"> <ul> <li><h4>Koha</h4></li> <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li> <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a> </li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li> <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Advanced Search</a></li> <li><a href="/cgi-bin/koha/search.marc/searchSH.pl?type=intranet">Thorough Search</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">MARC Search</a></li> </ul></li> <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a></li><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li> </ul> </div> --- NEW FILE --- <div id="nav"> <ul> <li><h4>Koha</h4></li> <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li> <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a> <form method="post" action="/cgi-bin/koha/circ/circulation.pl"> <label for="findborrower">Issue to:</label> <input id="findborrower" name="findborrower" type="text" size="10" /> <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /> <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input type="submit" class="submit" value="Submit" /> </form></li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a> </li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li> <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/member.pl" method="post"> <label for="member">Search:</label><input id="member" type="text" size="10" name="member" /> <input type="submit" value="Search" class="submit" /> </form></li></ul></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Catalog</a><ul><li><form action="/cgi-bin/koha/search.pl" method="post"> <label for="keyword">Quick Search:</label><input id="keyword" type="text" size="10" name="keyword" /> <input type="submit" value="Search" class="submit" /> </form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Advanced Search</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">MARC Search</a></li> </ul></li> <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li> <li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a> <ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul> </li> </ul> </div> --- NEW FILE --- <div id="topmenu"><form action="/cgi-bin/koha/member.pl" method="post"> <label for="member">Patron Search</label> <input type="text" id="member" name="member" value="" /> <input type="submit" class="submit" name="Go" value="Search" /></form><form action="/cgi-bin/koha/simpleredirect.pl" method="post"> <input type="submit" class="submit" value="Add New Patron" /> <input type="hidden" name="chooseform" value="adult" /> </form></div> --- NEW FILE --- a:link { color : #0066CC; } a:visited { color : #0066CC; } a:hover { color : #993300; } a.delete { background-color : #CC3333; color : #FFFF99; display : block; font-weight : bold; margin : 2px; padding : 1px; text-align : center; text-decoration : none; } a.delete:hover { background-color : #FF3333; color : #FFFF99; } a.edit { background-color : #CCFF00; color : #3366CC; display : block; font-weight : bold; margin : 2px; padding : 1px; text-align : center; text-decoration : none; } a.edit:hover { background-color : #CCFF99; color : #000088; } a:link.current { background-color : transparent; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:link.current { background-color : transparent; color : #3366CC; } a:link.nav { background-color : #D8DEB8; color : #3366CC; } a:link.pages { background-color : #FFFFCC; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:visited.current { background-color : transparent; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:visited.current { background-color : transparent; color : #3366CC; } a:visited.nav { background-color : #D8DEB8; color : #3366CC; } a:visited.pages { background-color : #FFFFCC; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:hover.current { background-color : #CCFF00; color : #CC3333; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:hover.current { background-color : #CCFF00; color : #CC3333; } a:hover.nav { background-color : #CCFF00; color : #CC3333; } a:hover.pages { background-color : #CCFF00; color : #CC3333; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:active.current { background-color : #99CC00; color : #FFFF99; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:active.current { background-color : #99CC00; color : #FFFF99; } a:active.nav { background-color : #99CC00; color : #FFFF99; } a:active.pages { background-color : #99CC00; color : #FFFF99; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } body { background-color : #009999; color : #333333; font-family : arial, geneva, sans-serif; font-size : 16px; margin : 3px 0px 0px 5px; } caption { color : #000066; font-size : 16px; font-weight : bold; margin-top : 5px; text-align : left; } div.form, div.details { background-color : #FFFFCC; border : 0px; margin : 0px auto; padding : 5px; width : 99%; } div.details { margin-bottom: 5px; width : 95%; } div.details dl { margin : 0px; padding : 0px; } div.details dt { font-weight: bold; font-size: 12px; border-bottom : 1px solid #D8DEB8; padding : 2px; } div.details dd { font-size: 12px; } div.details ul { margin-top: 0px; margin-bottom: 0px; padding-top : 0px; padding-bottom : 3px; font-size : 12px; } div.items { background-color : #FFFFCC; border : 0px; margin : 0px auto; padding : 5px; width : 100%; } div.items td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 1px solid #E7E7CA; border-top : 1px solid #E7E7CA; font-size : .75em; padding: 2px; } div.items th { background-color : #FFC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 1px solid #E7E7CA; color : #000088; font-size: .75em; font-weight : bold; padding : 2px; text-align : left; vertical-align : top; } div.details td, div.form td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; } div.details td:first-child, div.form td:first-child { font-weight : bold; text-align : right; width : 25%; } div.details td+td, div.form td+td { font-weight : normal; text-align : left; width : 75%; } div.compact td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; font-weight : normal; font-size : 13px; padding : 1px 1px 1px 10px; } div.compact th { border-bottom : 1px solid #999933; border-left : 1px solid #E7E7CA; border-right : 1px solid #999933; border-top : 0px; padding : 1px 10px 1px 1px; font-weight : normal; font-size : 13px; text-align : right; width : 20%; vertical-align: top; } div.error { background-color : #FFFF99; border : 1px dashed #990000; font-size : 16px; line-height : 18px; margin : 10px auto; padding : 5px; width : 65%; } div.error .submit { background-color : #993300; font-size: 14px; color: #E7E7CA; padding : 2px 15px 2px 15px; } div.error h3 { color : #990033; } div.error p { margin : 0px; padding : 0px 0px 0px 20px; } div.notice { background-color : #FFFF99; border : 1px dashed #990000; font-size : 16px; line-height : 18px; margin : 10px auto; padding : 5px; } div.flags li { list-style : circle; } div.flags ul { margin : 0px; padding : 0px; } div.form { background-color : #FFFFCC; border : 0px dotted #333333; margin : 0px auto; padding : 5px; position : relative; } div.menu { width : 100%; } div.menu th { background-color : #FFFFCC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; font-size : 101%; font-weight : bold; text-align : right; } div.menu td+td { font-size : 90%; font-weight : normal; text-align : left; } div.tabitem { display : inline; } div.tabitem form { display : inline; white-space : nowrap; } div.tabitem ul li { margin-left: 0; margin-bottom: 0; padding: 2px 15px 5px; border: 1px solid #000; list-style: none; display: inline; } div.tabitem ul li.here { border-bottom: 1px solid #ffc; list-style: none; display: inline; } div.table, div.form { width : 100%; } fieldset { border : 0; padding : 0; white-space : nowrap; } fieldset.list { white-space : normal; } form { margin : 0px; padding : 0px; } h1 { color : #000066; font-size : 20px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h2 { color : #000066; font-size : 18px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3 { color : #000066; font-size : 16px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3.alert { background-color: #FFCC33; color: #CC0000; padding: 3px; } h4 { color : #000066; font-size : 14px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h5 { color : #000066; font-size : 13px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } h6 { color : #000066; font-size : 12px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } label { font-weight : bold; padding : 0px 5px 0px 5px; } table { background-color : #FFFFCC; border-bottom : 0px solid #000000; border-collapse : collapse; border-left : 0px solid #000000; margin : 3px 0px 5px 0px; padding : 0px; width : 99%; } td { border-bottom : 1px solid #E7E7CA; border-right : 1px solid #E7E7CA; font-size : 12px; padding : 5px 5px 5px 5px; } td:last-child { border-bottom : 1px solid #E7E7CA; border-right : 0px solid #E7E7CA; font-size : 12px; padding : 5px 5px 5px 5px; } td+ul { margin-top : 0px; margin-bottom : 0px; } th { background-color : #D8DEB8; border-bottom : 1px solid #000000; border-right : 1px solid #000000; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } th:last-child { background-color : #D8DEB8; border-bottom : 1px solid #000000; border-right : 0px solid #000000; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } td.input, div.form td, div.details td { border-bottom : 1px solid #E7E7CA; border-left : 0px; border-right : 0px; color : #000000; line-height : 1.5em; padding : 4px; text-align : right; } td.label, div.form th, div.details th { background-color : #FFC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; text-align : left; vertical-align : top; } td.label { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; } tr.highlight { background-color : #FFFFFF; } /*.barcode { display : block; text-align : right; font-style: italic; font-size : .95em; color: #666633; }*/ .cancel { background-color : #993300; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .current { background-color : #FFFFFF; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } .error { color : #CC0033; font-weight : bold; } .ex { font-family : "Courier New", Courier, monospace; } .form dd { border-bottom : 1px solid #E7E7CA; color : #000000; display : block; line-height : 1.5em; padding : 4px; text-align : right; } .form dl { margin : 0px 0px 0px 0px; padding : 3px; width : 80%; } .form dt { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; color : #000088; float : left; font-weight : bold; line-height : 1.5em; padding : 4px; } .inline { display : inline; } .menu input { font-size : 80%; } input.focus { background-color: #FFF; border-bottom: 2px dashed #993300; } input.unfocus { background-color : #FFF; } .nav { font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } .print { font-size: 10px; } .submit { background-color : #669999; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .yes { float: left; padding : 0px 15px 0px 15px; width : 33%; margin : 0px 2px 0px 2px; text-align: center; } .no { float: right; padding : 0px 15px 0px 15px; width : 33%; margin : 0px 2px 0px 2px; text-align: center; } #main { background-color : #CCCC99; border-left : 1px solid #CCCC99; margin-left : 20%; margin-right : 2%; margin-top : 2%; padding : 10px; position : relative; } #menu { background-color : #FFFFCC; } #menu dd { border-bottom : 1px dashed #D8DEB8; border-left : 1px dashed #D8DEB8; border-right : 0px solid #000000; border-top : 0px solid #000000; padding : 3px 45px 3px 10px; } #menu dd a { font-size : 1.05em; font-weight : bold; text-decoration : none; } #menu dd li { display : inline; white-space : nowrap; } #menu dd li:before { content : "\00BB \0020"; } #menu dd ul { display : inline; list-style : disc; } #menu dl { margin : 0px; padding : 0px; /*width : 80%;*/ } #menu dt { background-color : #FFFFFF; border-bottom : 1px solid #D8DEB8; border-left : 0px solid #D8DEB8; border-right : 0px solid #000000; border-top : 0px solid #000000; color : #000066; font-size : 1.2em; font-weight : bold; padding : 2px 2px 2px 5px; } #menu dt a { text-decoration : none; } #nav { background-color : #CCCC99; float : left; margin : 2% 0% 0% 1%; padding : 0px; width : 15%; } #nav .submit { font-size : 9px; } #nav a { font-family : Tahoma, arial, geneva, sans-serif; font-weight : bold; text-decoration : none; } #nav h4 { font-size : 12px; font-weight : bold; margin : 0px; padding : 0px; text-align : left; } #nav input { font-size : .8em; } #nav label { font-size : 10px; } #nav ul { margin : 0px; padding : 0px; } #nav ul li { background-color : #D8DEB8; border-bottom : 1px solid #FFFFCC; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; border-top : 0px solid #FFFFCC; font-size : .8em; list-style : none; padding : 3px; text-align : right; width : 100%; } #nav ul li+li { border-bottom : 1px solid #FFFFCC; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; } #nav ul ul { margin : 0px 0px 0px 5px; } #nav ul ul li { background-color : #EFF1D8; border-bottom : 1px solid #CCCC99; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; border-top : 0px solid #FFFFCC; font-size : .9em; list-style : none; margin : 0px 0px 0px 0px; padding : 0px 0px 0px 0px; text-align : right; width : 100%; } #nav ul ul li+li { border-bottom : 1px solid #CCCC99; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; padding : 0px 0px 0px 0px; } #notes { float : right; margin : 0px; font-size : 12px; } #notes ul { margin : 0px; padding : 0px; } #results, .results { color : #000066; font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; font-size : .8em; margin : 0px; padding : 3px 0px 15px 0px; } #topmenu { color : #CCCC99; margin-bottom : 5px; margin-left : 20px; margin-right : 10px; } #topmenu .submit { background-color : #999933; color : #FFFFCC; font-size : .7em; padding : 2px; } #topmenu a:link { color : #CCFF66; font-weight : bold; padding : 2px; } #topmenu a:visited { color : #CCFF66; font-weight : bold; padding : 2px; } #topmenu a:hover { color : #FFFFCC; font-weight : bold; padding : 2px; } #topmenu a:active { color : #FFFFCC; font-weight : bold; padding : 2px; } #topmenu form { display : inline; } #topmenu label { font-weight : bold; } --- NEW FILE --- <script language="JavaScript" type="text/javascript"> // function isNotNull(f,noalert) { if (f.value.length ==0) { return false; } return true; } // function toUC(f) { var x=f.value.toUpperCase(); f.value=x; return true; } // function isNum(v,maybenull) { var n = new Number(v.value); if (isNaN(n)) { return false; } if (maybenull==0 && v.value=='') { return false; } return true; } // function isDate(f) { var t = Date.parse(f.value); if (isNaN(t)) { return false; } } // function Check(f) { var ok=1; var _alertString=""; var alertString2; if (f.itemtype.value.length==0) { _alertString += "- itemtype missing\n"; } if (!(isNotNull(window.document.Aform.description,1))) { _alertString += "- description missing\n"; } if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) { _alertString += "- loan length is not a number\n"; } if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) { _alertString += "- rental charge is not a number\n"; } if (_alertString.length==0) { document.Aform.submit(); } else { alertString2 = "Form not submitted because of the following problem(s)\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; alertString2 += _alertString; alert(alertString2); } } </script> --- NEW FILE --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE ---

    Koha Intranet:

    --- NEW FILE ---
    Patrons Home |
     
    --- NEW FILE --- a:link { color : #000066; text-decoration: none; } a:visited { color : #000066; text-decoration: none; } a:hover { color : #993300; text-decoration: none; } body { background-color : #FFF; color : #333333; font-family : arial, geneva, sans-serif; font-size : 14px; margin : 0px 0px 0px 0px; } caption { color : #000066; font-size : 18px; font-weight : bold; margin-top : 5px; text-align : left; } div.table { width : 100%; } form { margin : 0px; padding : 0px; } h1 { color : #000066; font-size : 22px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h2 { color : #000066; font-size : 20px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3 { color : #000066; font-size : 18px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h4 { color : #000066; font-size : 16px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h5 { color : #000066; font-size : 15px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } h6 { color : #000066; font-size : 14px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } table, table.list { background-color : #FFFFFF; border-bottom : 0px solid #CCCCCC; border-collapse : collapse; border-left : 0px solid #CCCCCC; margin : 3px 0px 5px 0px; padding : 0px; width : 99%; } td { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-right : 1px solid #CCCCCC; font-size : 12px; padding : 5px 5px 5px 5px; } td:last-child { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-right : 0px solid #CCCCCC; font-size : 12px; padding : 5px 5px 5px 5px; } table.list th { background-color : #FFFFFF; text-align: left; font-size: 12px; font-weight: bold; padding: 5px; width : 25%; } th { background-color : #E9E9E9; border-bottom : 1px solid #CCCCCC; border-right : 1px solid #CCCCCC; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } th:last-child { background-color : #E9E9E9; border-bottom : 1px solid #CCCCCC; border-right : 0px solid #CCCCCC; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } td.input, div.form td, div.details td { border-bottom : 1px solid #CCCCCC; border-left : 0px; border-right : 0px; color : #000000; line-height : 1.5em; padding : 4px; text-align : left; } td.label, div.form th, div.details th { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-left : 1px solid #CCCCCC; border-right : 0px; border-top : 0px; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; text-align : right; vertical-align : top; } tr.highlight { background-color: #CCCCCC; } .cancel { background-color : #993300; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .error { font-weight: bold; } .ex { font-family : "Courier New", Courier, monospace; } .inline { display : inline; } .print { display : none; } .submit { background-color : #669999; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } #main { background-color : #FFF; border-left : 0px solid #CCCC99; margin-left : 2%; margin-right : 2%; margin-top : 1%; padding : 5px; position : relative; } --- NEW FILE --- if (document.images) { home0 = new Image(); home0.src = "/intranet-tmpl/npl/en/images/home0.gif"; library0 = new Image(); library0.src = "/intranet-tmpl/npl/en/images/library0.gif"; kids0 = new Image(); kids0.src = "/intranet-tmpl/npl/en/images/kids0.gif"; teens0 = new Image(); teens0.src = "/intranet-tmpl/npl/en/images/teens0.gif"; readers0 = new Image(); readers0.src = "/intranet-tmpl/npl/en/images/readers0.gif"; search0 = new Image(); search0.src = "/intranet-tmpl/npl/en/images/search0.gif"; branch0 = new Image(); branch0.src = "/intranet-tmpl/npl/en/images/branch0.gif"; programs0 = new Image(); programs0.src = "/intranet-tmpl/npl/en/images/programs0.gif"; mobile0 = new Image(); mobile0.src = "/intranet-tmpl/npl/en/images/mobile0.gif"; OPLIN0 = new Image(); OPLIN0.src = "/intranet-tmpl/npl/en/images/OPLIN0.gif"; contact0 = new Image(); contact0.src = "/intranet-tmpl/npl/en/images/contact0.gif"; home1 = new Image(); home1.src = "/intranet-tmpl/npl/en/images/home1.gif"; library1 = new Image(); library1.src = "/intranet-tmpl/npl/en/images/library1.gif"; kids1 = new Image(); kids1.src = "/intranet-tmpl/npl/en/images/kids1.gif"; teens1 = new Image(); teens1.src = "/intranet-tmpl/npl/en/images/teens1.gif"; readers1 = new Image(); readers1.src = "/intranet-tmpl/npl/en/images/readers1.gif"; search1 = new Image(); search1.src = "/intranet-tmpl/npl/en/images/search1.gif";; branch1 = new Image(); branch1.src = "/intranet-tmpl/npl/en/images/branch1.gif"; programs1 = new Image(); programs1.src = "/intranet-tmpl/npl/en/images/programs1.gif"; mobile1 = new Image(); mobile1.src = "/intranet-tmpl/npl/en/images/mobile1.gif"; OPLIN1 = new Image(); OPLIN1.src = "/intranet-tmpl/npl/en/images/OPLIN1.gif"; contact1 = new Image(); contact1.src = "/intranet-tmpl/npl/en/images/contact1.gif"; } // Function to 'activate' images. function imgOn(imgName) { if (document.images) { document[imgName].src = eval(imgName + "0.src"); } } // Function to 'deactivate' images. function imgOff(imgName) { if (document.images) { document[imgName].src = eval(imgName + "1.src"); } } --- NEW FILE --- .contentholder { position: relative; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; } .tabholder { margin-top : 5px; padding: 0; position: relative; z-index: 2; } .tab { border: 2px; border-color: #999999; border-bottom-style: none; line-height: 150%; text-align: center; padding: 4px 10px 4px 10px; margin: 0; cursor: pointer; cursor: hand; font-family: Arial, Helvetica, sans-serif; font-size: 12px; font-weight: bold; background-color: #D8DEB8; color: #000066; } .panelholder { position: relative; top: 3px; z-index: 1; width: 100%; visibility: visible; display: block; } .panel { position: relative; color: #000000; background-color: #FFFFCC; border: 2px; border-color: #999999; top: 0; left: 0; padding: 10px; display: none; } From oleonard at users.sourceforge.net Thu Feb 19 20:11:58 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:11:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/marcimport AcceptBiblioitem.tmpl,NONE,1.1 AcceptItemCopy.tmpl,NONE,1.1 AcceptMarcUpload.tmpl,NONE,1.1 ListFileRecords.tmpl,NONE,1.1 mainmenu.tmpl,NONE,1.1 marcimportdetail.tmpl,NONE,1.1 uploadmarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30588/koha-tmpl/intranet-tmpl/npl/en/marcimport Added Files: AcceptBiblioitem.tmpl AcceptItemCopy.tmpl AcceptMarcUpload.tmpl ListFileRecords.tmpl mainmenu.tmpl marcimportdetail.tmpl uploadmarc.tmpl Log Message: New NPL templates --- NEW FILE ---
    New Record | New File
    Record already in database
    is already in the database with biblionumber and biblioitemnumber

    Record entered into database
    has been entered into the database with biblionumber and biblioitemnumber
    Add a New Item for
    "> "> ">
    BARCODE"> Home Branch:
    Replacement Price:
    Notes

    --- NEW FILE ---

    Barcode '' has already been assigned.

    Error :

    Item added with barcode

    Main Menu

    --- NEW FILE ---

    >Main Menu

    Select a set of MARC records

    \n

    Upload a set of MARC records
    Upload a set of MARC records:
    ?menu=" enctype="multipart/form-data">
    Name this set of MARC records:
    --- NEW FILE ---

    Main Menu

    Select a New File

    Select a Record to Import from
    > " [Viewing to of records] |
    Search still pending... processing... No results found for query ?file=&resultsid=&=&searchfield=&searchvalue=> --> ?file=&numrecord=>
    --- NEW FILE ---

    Main Menu

    --- NEW FILE --- > ()

    New Record

    Full MARC Record available at bottom
    Title" size=40 maxlenght=255>
    Subtitle" size=40 maxlenght=255>
    Author" size=40 maxlenght=255>
    Additional authors
    Illustrator" size=40 maxlenght=255>
    Copyright" size="20" maxlenght=80>
    Series Title" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Number" size=40 maxlenght=255>
    Volume Date" size=40 maxlenght=255>
    Volume Description" size=40 maxlenght=255>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item Type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    LCCN" size=40 maxlenght=40>
    Dewey" size=8 maxlenght=10>
    Subclass" size=40 maxlenght=40>
    Publication Year" size=5 maxlenght=10>
    Publisher" size=40 maxlenght=255>
    Place" size=40 maxlenght=255>
    Pages" size=5 maxlenght=10>
    Size" size=40 maxlenght=40>
    "> "> "> "> --> "> "> ">
    MARC RECORD
          "> 
    --- NEW FILE ---

    >Main Menu

    Select a set of MARC records

    Upload a set of MARC records
    Upload a set of MARC records:
    ?menu=" enctype="multipart/form-data">
    > Name this set of MARC records:
    From oleonard at users.sourceforge.net Thu Feb 19 20:12:45 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:12:45 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members imemberentry.tmpl,NONE,1.1 jmemberentry.tmpl,NONE,1.1 member-password.tmpl,NONE,1.1 member.tmpl,NONE,1.1 memberentry.tmpl,NONE,1.1 members-home.tmpl,NONE,1.1 moremember.tmpl,NONE,1.1 pay.tmpl,NONE,1.1 readingrec.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30848/koha-tmpl/intranet-tmpl/npl/en/members Added Files: imemberentry.tmpl jmemberentry.tmpl member-password.tmpl member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl pay.tmpl readingrec.tmpl Log Message: New NPL templates --- NEW FILE ---

    Edit Institution

    Add New Institution

    " />
    " />
    " />
    " />
    " />
    Contact Details
    " />
    " />
    " />
    " />
    Institution Details
    " />

    --- NEW FILE ---
    " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " />

    Add New Juvenile Patron

    Parent or Guardian
    " />
    " />
    " size="20" > -->
    Child
    " name="cardnumber_child_" size="20" value="" />" value="" />
    " name="firstname_child_" size="20" />
    " name="surname_child_" size="20" />
    " id="dateofbirth_child_" size="10" />
    " name="sex_child_" value="F" />F " value="M" />M

    --- NEW FILE ---

    Password Updated

    ">Return to Member Details

    ">

    Change Username and/or Password for

    You have entered a User ID that already exists. Please choose another one.
    New UserID:" />
    New Password:" />

    '; return false;" />

    --- NEW FILE ---
    -->
    Patron Search Results
    Card Name Cat Address OD/Issues Notes
    (" title="Issue to this Patron">ISS) ">,
    No results found
    --- NEW FILE ---

    :

    ,

    " /> checked="checked" />F checked="checked" /> M
    " /> " /> ()
    " />
    " />
    " size="20" />
    " />
    " />
    " />
    " />
    Alternate Contact
    " />
    " />
    Flags
    " name="" value="1" />Yes " name="" value="0" />No
    Patron Details
    " maxlength="7" /> " /> " /> " /> " />

    " />UpdateAdd This Member" /> '; return false;" />

    --- NEW FILE ---

    Patrons

    --- NEW FILE ---

    ()

    " />" />" />
    " />
    " />
    " />
    " />
    Name: ,
    Address:
    ,
    Permanent Address:
    ,
    Home Phone:  
    Work Phone:
    Fax:
    E-mail:">
    Text messaging:
    Date of Birth: 
    Sex: 
    Member Number:
    Category:
    Registration Date:,  
    Expiration Date 
    Registration Branch:
    Ethnicity:,
    General Notes:

    Alternate Contact:
    • Name:
    • Phone:
    • Relationship:
    • Notes:
    Guarantees: 
    Guarantor: ">
    No guarantor
    Fines & Charges
    &bib=&bi=">  
    ">View Account ">Pay Fines
    " />
    -->
    Items On Loan
    Title Due Itemtype Renew Return
    &bib=&bi="> ">Reserved " value="y" /> ">Return

    " />" value="y" />
    " /> " />
    Reserves
    Title Requested Remove
    ">

    Reading Record
    ">View Patron's Reading Record
    --- NEW FILE ---
    " />
    Pay Fines for
    Fines & Charges Description Account Type Amount Amount Outstanding
    " type="radio" name="payfine" value="no" checked="checked" />
    " name="payfine" value="yes" />
    " name="payfine" value="wo" />
    " value="" /> " value="" /> " value="" /> " value="" /> " value="" /> " value="" />
    Total Due
    " name="bornum" />
    --- NEW FILE --- From oleonard at users.sourceforge.net Thu Feb 19 20:15:19 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:15:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports reports-home.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31482/koha-tmpl/intranet-tmpl/npl/en/reports Added Files: reports-home.tmpl Log Message: New NPL templates --- NEW FILE ---

    Reports

    From oleonard at users.sourceforge.net Thu Feb 19 20:16:52 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:16:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc result.tmpl,NONE,1.1 search.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/koha-tmpl/intranet-tmpl/npl/en/search.marc Added Files: result.tmpl search.tmpl Log Message: New NPL templates --- NEW FILE --- --- NEW FILE ---

    Advanced MARC Search

    " />
    Help:

    Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search. Search commits the request and displays the results.
      value="" />
    Results per page :
    From oleonard at users.sourceforge.net Thu Feb 19 20:19:58 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:19:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/value_builder unimarc_field_100.tmpl,NONE,1.1 unimarc_field_105.tmpl,NONE,1.1 unimarc_field_225a.tmpl,NONE,1.1 unimarc_field_60X.tmpl,NONE,1.1 unimarc_field_700-4.tmpl,NONE,1.1 unimarc_field_700_701_702.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32499/koha-tmpl/intranet-tmpl/npl/en/value_builder Added Files: unimarc_field_100.tmpl unimarc_field_105.tmpl unimarc_field_225a.tmpl unimarc_field_60X.tmpl unimarc_field_700-4.tmpl unimarc_field_700_701_702.tmpl Log Message: New NPL templates --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Année début ">
    Année fin ">
    --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Ann?e d?but ">
    Ann?e fin ">
    --- NEW FILE --- UNIMARC Field 225a builder
    Select a collection
    --- NEW FILE --- Thesaurus search

    Recherche

    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
    "> "> ">

    Results

    &level=&search_string="> ')">

    Dependancies

    &level=&search_string=+"> ')">

    Adding

    "> "> Create a new authority/thesaurus entry : ">
    --- NEW FILE --- UNIMARC constructeur champ 700-4

    Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.

    Code date publication
    --- NEW FILE --- Personal Authorities builder

    "> "> "> "> "> ">

    "> ">
    "> insert a new authority : ">
    From oleonard at users.sourceforge.net Thu Feb 19 20:21:25 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:21:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/z3950 searchresult.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv346/koha-tmpl/intranet-tmpl/npl/en/z3950 Added Files: searchresult.tmpl Log Message: New NPL templates --- NEW FILE --- ">

    Z3950 Search Results

    ">
    Bibliographic Records Found
    Title Author ISBN coming from    
    )">Import this biblio
    Nothing found

    Still requests to go

    From oleonard at users.sourceforge.net Thu Feb 19 20:01:06 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:01:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio-nomarc.tmpl,NONE,1.1 addbiblio.tmpl,NONE,1.1 addbooks.tmpl,NONE,1.1 additem-nomarc.tmpl,NONE,1.1 additem.tmpl,NONE,1.1 isbnsearch.tmpl,NONE,1.1 marcimport.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28575/koha-tmpl/intranet-tmpl/npl/en/acqui.simple Added Files: addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl additem.tmpl isbnsearch.tmpl marcimport.tmpl Log Message: New NPL templates --- NEW FILE --- Adding a new Biblio
    Section One: Copyright Information

     

    Please Specify a Title
    Title: *
    Subtitle:
    Author:
    Series Title:
    (if applicable)
    Copyright Date:
    Abstract:
    Notes:
    * Required --- NEW FILE ---
    " />

    Edit MARC Record Number Add MARC Record

    Save Bibliographic Record and Go To ItemsAdd Bibliographic Record and Go To Items" onclick="Check(this.form);" class="submit" accesskey="w" />
    007-130 240-490 500-586 600-655 700-856 942
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
      * " /> " /> " /> " /> " />
    " /> " /> " /> " /> " /> " /> " /> " /> " />
    --- NEW FILE ---

    Catalog Maintenance

     

    No items found

     

    Website Biblioitem Added " />
    Create Brief Record

    -->

    Search Existing Records

    • If the ISBN is found into the biblio table, it will be retrieved and can be modified.
    • If the ISBN is found into the breeding farm, it will be retrieved, and a biblio added.
    • Otherwise, a biblio can be added from scratch.


    Add New Website
    --- NEW FILE --- test

    You must give the item a barcode

    You must create a new group for your item to be added to

    Sorry, that barcode is already in use

    BIBLIO RECORD
    Author:
    Copyright:
    Series Title:
    Notes:
    GROUP -
    URL:
    Date:
    Notes:
    GROUP -
    ISBN:
    Dewey:
    Publisher:
    Place:
    Date:
    Item:
    Home Branch:
    Notes:

    ">
    ADD NEW ITEM:
    For a website add the group only
    Item Barcode:
    Branch:
    Replacement Price:
    Notes:
    Add to existing group:
    Group:
    OR Add to a new Group:
    Format:
    ISBN:
    Publisher:
    Publication Year:
    Place of Publication:
    Illustrator:
    Additional Authors:
    One Author per line
    Subject Headings:
    One Subject per line
    Website URL:
    Dewey:
    Dewey Subclass:
    ISSN:
    LCCN:
    Volume:
    Number:
    Volume Description:
    Pages:
    Size:
    Notes:
    --- NEW FILE ---

    Items for Bibliographic Record

    ">
    ">
    Existing Items
     
    &itemnum=">Edit
    ERROR: Barcode already exists!

    Add New ItemUpdate Item

    "> ">
    * "> "> ">
    "> "> "> ">
    --- NEW FILE ---

    Biblio Search Results for ISBN title

    results found
    Results to displayed
    Existing Bibliographic Records
    Title Author © Call Number  
    ">   ">Edit Biblio">Edit Items
    Nothing found
    Bibliographic Records in the Breeding Farm
    Title Author ISBN coming from    
    ">Add biblio
    Nothing found
    " name="isbn" />
    --- NEW FILE ---
    " enctype="multipart/form-data">

    MARC acquisition system

    Import into breeding farm

    Import results :

      imported records

      not imported because already in DB

      not imported because already in farm

      not imported because they seems not to be MARC format (or ISBN/ISSN missing) !

      records parsed

      Back to acquisition

    • Select a file to import into breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in breeding farm. If an ISBN already exists in the breeding farm, you can choose wether to ignore the new one, or overwrite the old one.
    • You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested marc data comes !
    • Of course, if the ISBN already exists in active DB, the biblio will be ignored.
    Select the file to import :
    Name of this import :
    If ISBN already in breeding farm : Ignore this one, keep the existing one
    Overwrite the existing one with this
    From oleonard at users.sourceforge.net Thu Feb 19 20:14:38 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:14:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,NONE,1.1 aqbookfund.tmpl,NONE,1.1 aqbudget.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 categorie.tmpl,NONE,1.1 categoryitem.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,NONE,1.1 itemtypes.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 printers.tmpl,NONE,1.1 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 thesaurus.tmpl,NONE,1.1 z3950servers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31268/koha-tmpl/intranet-tmpl/npl/en/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: New NPL templates --- NEW FILE ---

    Koha Admin Page

    Parameters

    Biblio related
    Item types the supports of an item.
    Budget The monies allocated to your book funds.
    Book Funds Book fund administration. Remember to edit your book funds before you start editing the budgets.
    Authorised Values Define here categories and authorised values for them. Authorised values are used in MARC form to limit/help editing MARC biblios
    Thesaurus Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
    MARC related
    MARC tag structureMARC structure : tag then subfields
    Links koha - MARC DBDefine links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage
    Checks MARCChecks the MARC structure. USE IT before working with real datas. It will show mistakes that BREAKS koha database!
    Various parameters
    Library Branches the differents branches you manage with this Koha server
    Borrower Categories the differents types of borrowers.
    Currencies Currencies of booksellers.
    Printers Printers (UNIX paths).
    Stop Words Words deleted during searches
    Z39.50 Servers Servers to query for MARC data
    System Preferences System preferences

    Tools

    Import/Export
    MARC biblio export Exporting in MARC format
    Upload MARC records in Breeding Farm The breeding farm is a table where imported MARC records are stored.
    A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm.
    --- NEW FILE ---

    Bookfund Administration

    You Searched for
    Book fund Name Edit Delete
    ?op=add_form&bookfundid= "> ?op=add_form&bookfundid= ">Edit ?op=delete_confirm&bookfundid=">Delete
      Budget ">Add Budget
      - : ">Edit ">Delete

    " name="Aform" method="post">
    Book fund" />
    Book fund
    Name" />

    '; return false;" />

    Data Recorded

    " method="post">

    Confirm Deletion of Fund

    Book fund
    Name
    Group
    " method="post">" />
    " method="post">

    Data Deleted

    " method="post">
    --- NEW FILE ---

    Budget admin

    You Searched for
    Book fundStart dateEnd dateBudget amount 
    () ">Edit ">Delete

    Book fund" />
    Book fund name
    Bookfund" />
    Start date ()" /> 
    End date ()" />
    Budget amount" />
    " />

    Budget Data Recorded

    " method="post">

    Delete Book Fund ''?

    Start date
    End date
    budgetamount
    " method="post">" />
    " method="post">

    Book fund deleted

    " method="post">
    --- NEW FILE ---
    " name="Aform" method="post">

    Category
    Authorised value " />
    Lib " />

    " />

    Confirm Deletion

    Variable Lib
    Value
    " method="post"> " /> " />
    " method="post">

    Authorised values admin

    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.

    When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio, the subfield is not entered through a free field, but though a list of authorised values

    Category Authorised value Lib Edit Delete
    "> ">Edit ">Delete
    " method="post"> " />
    --- NEW FILE ---

    " name="Aform" method="post">
    Branch code " /> " />
    Name " /> 
    " />
    Address " />
      " />
      " />
    Phone " />
    Fax " />
    E-mail " />

    Confirm of Branch :

    " method="post"> " />
    " method="post">
    Name Code Address Category    
    (nothing entered)


    Ph:
    Fax:
    Email:     		(no categories set)
    " />
    " />

    Branches Categories
    Name Code Description    
    " />
    " />
    " method="post">

    Category code " /> " />
    Name " /> 
    Description " /> 
    Confirm delete:
    " />
    " method="post">
    --- NEW FILE ---
    " name="Aform" method="post">

    Modify category

    Add category

    Category code " />
    Category code
    Description
    Enrolment period years
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrollment fee
    Overdue notice required" />
    Issue limit" />
    Reserve fee" />

    Update CategoryAdd Category" onclick="Check(this.form);" /> '; return false;" />

    Data recorded

    " method="post">

    Confirm Deletion of Category

    Patrons with Category '':

    Category code
    Description
    Enrolment period
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee

    This category is used times. Deletion not possible

    " method="post"> " />
    " method="post">
    " method="post"> " />
    " method="post">

    Category Deleted

    " method="post">

    Patron Category Administration

    You Searched for
    " method="post"> " />
    --> --> -->
    Category Description Enrollment Upper Age Limit Age Required Bulk Overdue Issue Limit  
    ?op=add_form&categorycode=">Edit ">Delete
    " method="post">
    --- NEW FILE ---

    Modify category

    Add category

    " name="Aform" method="post">
    Category code ">
    Category code
    Description ">  
    Enrolment period ">
    Upperage limit ">
    Age Required ">
    Fine type ">
    Bulk ">
    Enrolment fee ">
    Overdue notice required ">
    Issue limit ">
    Reserve fee ">
     
    Data recorded " method="post">
    TOTAL : :
    "> data deleted

    Category admin

    You Searched for " method="post">
    Category code
    Description
    Enrolment period
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee
    This record is used times. Deletion not possible
    " method="post">
    CONFIRM DELETION
    ">
    Category Description Enrolment Upper Age Limit Age Required Fine Bulk Fee Overdue Issue Limit Reserve    
    ?op=add_form&categorycode=">Edit ?op=delete_confirm&categorycode=">Delete

    " method="post">

    --- NEW FILE ---

    Calculating Fines

    Each box needs to be filled in with fine,time to start charging,charging cycle

    eg 1,7,7 = $1 fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

     
    "> " value="" size="6" maxlength="10">
    --- NEW FILE ---

    MARC Checks

    Test Result
    itemnum
    • The field itemnum MUST be mapped
    • The correspounding subfield MUST be in with -1 (ignore) tab
    OK itemnum : the field itemnumber is mapped to a field in tab -1
    item fields ALL items fields MUST :
    • be mapped to the same tag,
    • and they must all be in the 10 (items) tab
    OK All item fields are in the same tag and in item tab
    itemtype NOT mapped the biblioitems.itemtype field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised_value=itemtype
    OK biblioitems.itemtype defined
    homebranch NOT mapped the items.homebranch field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised value=branches
    OK homebranch defined
    holdingbranch NOT mapped the items.holdingbranch field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised value=branches
    OK holdingbranch defined
    biblio and biblionumber The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
    • be mapped to a MARC subfield,
    • be in the SAME tag (for example : 090$a and 090$b)
    • be in tab -1
    OK biblionumber and biblioitemnumber mapped correctly
    TOTAL You have error(s) in your MARC configuration. Please fix them before using Koha

    Configuration OK, you don't have errors in your MARC parameters table

    --- NEW FILE ---
    Modify currency Add currency
    Currency " />
    Currency
    Rate " />
    '; return false;" />

    Data Recorded

    " method="post">
    Confirm Deletion of Currency
    Currency
    Rate
    This currency is used times. Deletion not possible
    " method="post">
    " />
    " method="post">

    Currency Deleted

    " method="post">

    Currencies admin

    You searched for
    Currency Rate  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    ?offset="><< Prev ?offset=">Next >>
    --- NEW FILE ---
    " name="Aform" method="post">
    Modify item type Add item type
    Item type" />
    Item type
    Description " /> 
    Not for loan checked="checked" value="1"> (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)
    Loan length "> (meaningful only if not for loan is not set)
    Renewals allowed? checked="checked" value="1" />
    Rental charge " />
    -->
    Cannot Delete Item TypeDelete Item Type ''?
    Item type
    Description
    Loan length
    RenewalsAllowedNot allowed
    " method="post"> " />
    This record is used times. Deletion is not possible.
    " method="post">
    " method="post">
    -->
    Item Types Administration
    Code Description Loan Length Renewable Edit Delete
    ?op=add_form&itemtype="> YesNo ?op=add_form&itemtype=">Edit ?op=delete_confirm&itemtype=">Delete
    " method="post">

    '; return false;" value="<< Previous Page" /> '; return false;" value="Next Page >>" />

    --- NEW FILE ---

    Choose and validate 1 of the following for .

    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " name="Aform" method="post"> " /> " />

    MARC links

    " method="post">

    Koha Field Tag Subfield Lib
    "> ">Edit
    --- NEW FILE ---
    " name="Aform" method="post">

    Field Lib for librarians / for opac Repeat Mand Koha field Tab Authorised value or
    Thesaurus category
    - " size="40" maxlength="80" />
    " size="40" maxlength="80" />
    or
    or
    '; return false;" />

    Note : in the last column, you can choose :

    • An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table
    • A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table
    • A "value builder" : values builders are perl program that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly
    Confirm Deletion of Subfield
    Subfield
     
    " method="post">" /> " /> " />
    " method="post">" />
    data deleted
    method="post">" />

    MARC subfield structure admin for

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit".

    The column koha field shows that the subfield is linked with a "koha field". Koha can manage a marc interface, or a koha interface. This link ensure that both DB are synchronized, thus you can change from MARC to KOHA interface easily.

    Subfield Lib Koha Field ? Rep ? Mand ? Tab ? Auth value ? Thesaurus ? Val build ? Delete
          YesNo  YesNo          ">Delete
    //images/1leftarrow.png" title="previous" alt="previous" border="0" />
    " />
    " name="searchfield" />
    //images/1rightarrow.png" title="next" alt="next" border="0" />
    --- NEW FILE ---

    " name="Aform" method="post">
    Tag
    Lib for librarians" size="80" maxlength="100" />
    Lib for opac" size="80" maxlength="100" />
    Repeatable
    Mandatory
    Authorised value (if you select a value here, the indicators will be limited to the authorised value list)

    '; return false;" />

    Confirm Deletion of Tag

    Tag
     
    " method="post">" />
    " method="post">

    Data Deleted

    " method="post">

    MARC tag structure admin

    " method="post">
    Tag Lib Repeatable Mandatory Authorised value Subfields Edit/Delete
    "> YesNo YesNo ">subfields ">Edit ">Delete
    <<Previous Tags
    " method="post">
    Next Tags >>
    --- NEW FILE ---

    Modify printer

    Add printer

    " name="Aform" method="post">
    Printer Name
    Printer Name
    Queue " />
    Type " />

    ';" />

    Printer Added

    " method="post">

    Confirm Deletion of Printer

    Printer
    Queue
    Type
    " method="post"> " />
    " method="post">

    Printer Deleted

    " method="post">

    Printer Admin

    You searched for
    " method="post"> " />
    Name Queue Type  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    " method="post">

    ?offset="><< Prev ?offset=">Next >>
    --- NEW FILE ---

    Modify Stop Word

    Add Stop Word

    Stop Word
    Stop Word:

    Update Stop WordAdd Stop Word " onclick="Check(this.form);" class="submit" /> ';" />

    Stop Word Added

    " method="post">

    Confirm Deletion of Stop Word

    Stop Word:
    " method="post"> " />
    " method="post">

    Stop Word Deleted

    " method="post">

    Stop Words Admin

    " method="post"> " />
    You searched for
    Word  
    ?op=delete_confirm&searchfield=">Delete
    " method="get">" />
    " method="post">
    " method="get">" />
    --- NEW FILE ---
    " name="Aform" method="post">

    Modify a system preference

    Add a system preference

    " />
    " />
    " />

    Update ParameterAdd Parameter" onclick="Check(this.form); return false;" class="submit" /> '; return false;" />

    Data Recorded

    " method="post">

    Confirm Deletion of Parameter

    " method="post">" />
    " method="post">

    Parameter Deleted

    " method="post">

    System Preferences Administration

    Variable Value Explanation  
    "> ">Edit ">Delete
    " method="post">

    --- NEW FILE ---

    Thesaurus management

     
    Values related to ()


    " method="post">
    Other forms    
    ">Edit ">Delete
    " method="post"> " /> " />

    " name="Aform" method="post">

    AddModify

    Category
    Authority lib " /> " maxlength="80" size="80" />
    Other lib " maxlength="80" size="80" />

    " /> " /> " /> " /> " /> " /> AddModify Value" />

    lib
    Value
    " method="post"> " /> " />
    CONFIRM DELETION of this entry and all entries depending from this one
    " method="post">

    Thesaurus management

    Manages thesaurus and authorities files.

    • Dig: see data dependent one this one
    • Related: see other forms of this authority entry
    " />
    &search_category=">
      Free form Authority Dig Related Edit Delete
      Dig Related ">//images/fileopen.png" width="32" hspace="0" vspace="0" border="0" /> ">//images/edittrash.png" width="32" hspace="0" vspace="0" border="0" />

    " method="post">

    " method="post"> " /> " /> " />

    --- NEW FILE ---
    " name="Aform" method="post">

    Modify Z39.50 Server

    Add Z39.50 Server

    Z39.50 Server " />
    Z39.50 Server
    Hostname " />
    Port " onblur="isNum(this)" />
    Database " />
    Userid " />
    Password " />
    Checked (searched by default) " onblur="isNum(this)" />
    Rank (display order) " onblur="isNum(this)" />
    Syntax (z3950 can send
    records in various format. Choose one)
    ';" />

    Z39.50 Server Added

    " method="post">

    Confirm Deletion of Server

    Site
    Hostname
    Port
    Database
    Userid
    Password
    Checked
    Rank
    " method="post"> " />
    " method="post">

    Z39.50 Server Deleted

    " method="post">

    Z39.50 Servers Admin

    " method="post"> " />
    You searched for
    Site Hostname Port Database Userid Password Checked Rank Syntax  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    " method="get"> " />
    " method="post">
    " method="get"> " />
    From oleonard at users.sourceforge.net Thu Feb 19 20:22:21 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:22:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en about.tmpl,NONE,1.1 auth.tmpl,NONE,1.1 bookcount.tmpl,NONE,1.1 boraccount.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 default.tmpl,NONE,1.1 intranet-main.tmpl,NONE,1.1 mancredit.tmpl,NONE,1.1 maninvoice.tmpl,NONE,1.1 member-flags.tmpl,NONE,1.1 modbib.tmpl,NONE,1.1 modbibitem.tmpl,NONE,1.1 moditem.tmpl,NONE,1.1 modwebsites.tmpl,NONE,1.1 newimember.tmpl,NONE,1.1 newjmember.tmpl,NONE,1.1 newmember.tmpl,NONE,1.1 opac-main.tmpl,NONE,1.1 overdue.tmpl,NONE,1.1 reports.tmpl,NONE,1.1 request.tmpl,NONE,1.1 reservereport.tmpl,NONE,1.1 searchheader.tmpl,NONE,1.1 shelves.tmpl,NONE,1.1 stats.tmpl,NONE,1.1 thesaurus_popup.tmpl,NONE,1.1 updatebiblio.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv614/koha-tmpl/intranet-tmpl/npl/en Added Files: about.tmpl auth.tmpl bookcount.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl member-flags.tmpl modbib.tmpl modbibitem.tmpl moditem.tmpl modwebsites.tmpl newimember.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl reports.tmpl request.tmpl reservereport.tmpl searchheader.tmpl shelves.tmpl stats.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: New NPL templates --- NEW FILE ---

    About Koha

    Data about the current version of Koha for bug reports (or general interest).

    Koha version:
    OS version (from 'uname -a'):
    Perl version:
    MySQL version:
    Apache version:
    --- NEW FILE ---

    Sorry, Koha doesn"t think you have permission for this page.

    Sorry, your session has timed out. Please login again.

    You are accessing Koha from a different ip address! Please login again.

    You entered an incorrect username or password. Please try again.

    " method="post"> " value="" />
    Koha Login
    --- NEW FILE ---

    ()

    Barcode

    ">
    ">">">">
    " name="bib">
    Home Branch:
    Current Branch:
    Date arrived at current branch:
    Number of issues since since the above date :
    Branch No. of Issues Last seen at branch
    --- NEW FILE ---
    Account for
    Fines & Charges Amount Still Owed
    Total Due
    " />
    " />
    " />
    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = $1 fine, after 7 days, every 7 days.

    " value="" size="6">
    --- NEW FILE ---

    TitleAuthorItem CountBiblionumber
    ">
    &startfrom=>Previous Records &startfrom=>Next Records

    Results through of records.
    --- NEW FILE ---
    --- NEW FILE ---

    Manual Credit

    " />
    Patron Number
    Credit Type
    Itemnumber
    Description
    Amount
    " name="bornum" />
    --- NEW FILE ---

    Manual Invoice

    " />
    Borrowernumber
    Type
    Itemnumber
    Description
    Amount
    " />
    --- NEW FILE ---
    "> " />
    Set Privileges for ,
    FlagNameDescription
    " />

    '; return false;" />

    --- NEW FILE ---
    ">Modify Website Links
    " /> " />
    Author " />
    Title " />
    Abstract
    Subject
    Copyright Date " />
    Series Title " />
    Additional Author " />
    Subtitle " />
    Unititle " />
    Notes
    Serial " />

    --- NEW FILE ---

    &type=intra"> ()
    Modify Group -

    " /> " />
    RE-ASSIGN TO EXISTING GROUP
    OR MODIFY DETAILS
    Item Type" size="20" />
    URL " size="20" />
    Class" size="20" />
    Publisher" size="20" />
    Place" size="20" />
    ISBN" size="20" />
    Publication Year" size="20" />
    Pages" size="20" />
    Illustrations" size="20" />
    Volume " size="20" />
    Notes " />
    Size " size="20" />
    CHANGES TO AFFECT THESE BARCODES
    Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.
      Barcode Location Date Due Last Seen
    " /> "amp;bib="TMPL_VAR Name="biblionumber">"amp;bi="TMPL_VAR Name="biblioitemnumber">">

    HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some items, tick the appropriate ones and a new group record will be created automatically for them.

    --- NEW FILE ---

    ()

    " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " />
    checked="checked"> Yes checked="checked"> No -->
    checked="checked" /> Yes checked="checked" /> No

    --- NEW FILE ---

    Web Sites

    " />
    " /> " />
    Title " />
    Description
    URL " />

    Add another Website Link

    " />
    Title
    Description
    URL
    --- NEW FILE ---
    Invalid cardnumber.

    Valid values

    Click below to confirm this new borrower.

    " value="" />
    --- NEW FILE ---

    Error Completing Form

    -->
    Confirm Details for
    Name
    Membership Number
    Barcode Number
    Date Of Birth
    Sex
    General Notes

    " value="" />

    --- NEW FILE ---

    Confirm Record

    Name: 
    Address: 
    Home Phone:  
    Work Phone:
    Fax:
    E-mail:
    Date Of Birth: 
    Sex: 
    Member Number: 
    Card Number: 
    Category: 
    Registration Date: 
    Expiration Date: 
    Registration Branch: 
    General Notes: 
    Alternate contact: 
    Contact's Phone: 
    Relationship to Patron: 
    Notes:

    " value="" />

    Error

    The following fields have a forbidden value. Please push the back button and try again :

    Cardnumber
    Invalid_cardnumber
    Gender
    Given Names
    Surname
    Postal Street Address
    Postal city
    --- NEW FILE --- WELCOME TO THE KOHA OPAC

    Koha: Horowhenua Library Trust Catalogue and Member Services    		 Search the Catalogue
       

    Type in the box and press the enter key.
    -Advanced Search (More Options)

    Logged in as: [Log Out]

    Log In to Koha

    --- NEW FILE ---

    Items Overdue as of

    Due Date Patron Phone Title Author
    ?subject=Overdue: ">
    --- NEW FILE ---

    reports

    --- NEW FILE ---
    " /> " />

    Add Reserve for ">

    Rank
    Date
    Pickup
    Card Number ?
    Cannot be selected > > -->   -->   -->
    Item Type Call Number Copies
     
    " action="modrequest.pl" method="post">

    Modify Existing Requests

    &type=intra" onClick="openWindow(this, 'Item', 480, 640)"> Next Available This type only : -->
    Rank Patron Notes Date Pickup Location
    " /> " /> ">   Item waiting at " />

    Delete a request by selecting "del" from the rank list.

    --- NEW FILE ---
    NameReserve DateTitleClass

    --- NEW FILE --- ">Results with dewey | ">Results with biblionumber
    --- NEW FILE ---

    Logged in as: [Log Out]

    Shelf List

    Add a book by barcode:

    "> Contents of shelf
    ">"> " width=10 align=center> "> " width=10 align=center> "> " width=10 align=center> ">

    "> ">

    Modify Shelf Contents

    Bookshelves

    "> Select Shelves to Delete
    "> "> ( books)

    Add Shelf:

    ">
    "> Shelf List
    "> "> ( books)

    Add or Remove Book Shelves

    --- NEW FILE ---
    Statistics
    Name Type Date/time Amount Branch

    Total paid:
    Total written off:

    No statistics to report

    --- NEW FILE --- Thesaurus value builder for category <!-- TMPL_VAR name="category" -->

    "> "> ">

    "> "> ">
    "> "> insert a new authority :
    --- NEW FILE ---

    Click submit to force the subject

    " value="" /> " />
    From oleonard at users.sourceforge.net Thu Feb 19 22:12:05 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 13:12:05 -0800 Subject: [Koha-cvs] CVS: npl-custom - Imported sources Message-ID: Update of /cvsroot/koha/npl-custom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26378 Log Message: Status: Vendor Tag: tcvs-vendor Release Tags: tcvs-release No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources From acli at users.sourceforge.net Thu Feb 19 22:24:33 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 13:24:33 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,NONE,1.1 xgettext.pl,NONE,1.1 TmplToken.pm,1.2,1.3 TmplTokenType.pm,1.2,1.3 TmplTokenizer.pm,1.10,1.11 text-extract2.pl,1.40,1.41 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27741 Modified Files: TmplToken.pm TmplTokenType.pm TmplTokenizer.pm text-extract2.pl Added Files: tmpl_process3.pl xgettext.pl Log Message: New scripts for translation into Chinese and other languages where English word order is too different than the word order of the target language to yield meaningful translations. The new scripts use a different translation file format (namely standard gettext-style PO files). This seems to reasonably work (e.g., producing an empty en_GB translation then installing seems to not corrupt the "translated" files), but it likely will still contain some bugs. There is also little documentation, but try to run perldoc on the .p[lm] files to see what's there. There are also some spurious warnings (both from bugs in the new scripts and from buggy third- party Locale::PO module). --- NEW FILE --- #!/usr/bin/perl # This file is part of Koha # Parts copyright 2003-2004 Paul Poulain # Parts copyright 2003-2004 Jerome Vizcaino # Parts copyright 2004 Ambrose Li =head1 NAME tmpl_process3.pl - Experimental version of tmpl_process.pl using gettext-compatible translation files =cut use strict; use Getopt::Long; use Locale::PO; use File::Temp qw( :POSIX ); use TmplTokenizer; use VerboseWarnings qw( error_normal warn_normal ); ############################################################################### use vars qw( @in_files $in_dir $str_file $out_dir ); use vars qw( @excludes $exclude_regex ); use vars qw( $recursive_p ); use vars qw( $pedantic_p ); use vars qw( $href ); use vars qw( $type ); # file extension (DOS form without the dot) to match ############################################################################### sub find_translation ($) { my($s) = @_; my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; return defined $href->{$key} && length Locale::PO->dequote($href->{$key}->msgstr)? Locale::PO->dequote($href->{$key}->msgstr): $s; } sub text_replace_tag ($$) { my($t, $attr) = @_; my $it; # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; my $translated_p = 0; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME my($pre, $trimmed, $post) = TmplTokenizer::trim $val; if ($val =~ /\S/s) { my $s = $pre . find_translation($trimmed) . $post; if ($attr->{$a}->[1] ne $s) { #FIXME $attr->{$a}->[1] = $s; # FIXME $attr->{$a}->[2] = ($s =~ /"/s)? "'$s'": "\"$s\""; #FIXME $translated_p = 1; } } } } if ($translated_p) { $it = "<$tag" . join('', map { sprintf(' %s=%s', $_, $attr->{$_}->[2]) #FIXME } sort { $attr->{$a}->[3] <=> $attr->{$b}->[3] #FIXME } keys %$attr) . '>'; } else { $it = $t; } return $it; } sub text_replace (**) { my($h, $output) = @_; for (;;) { my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { my($pre, $trimmed, $post) = TmplTokenizer::trim $t; print $output $pre, find_translation($trimmed), $post; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); print $output TmplTokenizer::parametrize($fmt, map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? text_replace_tag($t, $attr): $t } $s->parameters); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); } elsif (defined $t) { print $output $t; } } } # FIXME: Should we use the GNOME convention of using POTFILES.in instead? sub listfiles ($$) { my($dir, $type) = @_; my @it = (); if (opendir(DIR, $dir)) { my @dirent = readdir DIR; # because DIR is shared when recursing closedir DIR; for my $dirent (@dirent) { my $path = "$dir/$dirent"; if ($dirent =~ /^\./ || $dirent eq 'CVS' || $dirent eq 'RCS' || (defined $exclude_regex && $dirent =~ /^(?:$exclude_regex)$/)) { ; } elsif (-f $path) { push @it, $path if !defined $type || $dirent =~ /\.(?:$type)$/; } elsif (-d $path && $recursive_p) { push @it, listfiles($path, $type); } } } else { warn_normal "$dir: $!", undef; } return @it; } ############################################################################### sub usage_error (;$) { for my $msg (split(/\n/, $_[0])) { print STDERR "$msg\n"; } print STDERR "Try `$0 --help' for more information.\n"; exit(-1); } ############################################################################### GetOptions( 'input|i=s' => \@in_files, 'outputdir|o=s' => \$out_dir, 'recursive|r' => \$recursive_p, 'str-file|s=s' => \$str_file, 'exclude|x=s' => \@excludes, 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, ) || usage_error; VerboseWarnings::set_application_name $0; VerboseWarnings::set_pedantic_mode $pedantic_p; my $action = shift or usage_error('You must specify an ACTION.'); usage_error('You must at least specify input and string list filenames.') if !@in_files || !defined $str_file; # Type match defaults to *.tmpl plus *.inc if not specified $type = "tmpl|inc" if !defined($type); # Check the inputs for being files or directories for my $input (@in_files) { usage_error("$input: Input must be a file or directory.\n" . "(Symbolic links are not supported at the moment)") unless -d $input || -f $input;; } # Generates the global exclude regular expression $exclude_regex = '(?:'.join('|', @excludes).')' if @excludes; # Generate the list of input files if a directory is specified if (-d $in_files[0]) { die "If you specify a directory as input, you must specify only it.\n" if @in_files > 1; # input is a directory, generates list of files to process $in_dir = $in_files[0]; $in_dir =~ s/\/$//; # strips the trailing / if any @in_files = listfiles($in_dir, $type); } else { for my $input (@in_files) { die "You cannot specify input files and directories at the same time.\n" unless -f $input; } } if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; system {'./xgettext.pl'} ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { my($tmph1, $tmpfile1) = tmpnam(); my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2); system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { if(!defined($out_dir)) { usage_error("You must specify an output directory when using the install method."); } if ($in_dir eq $out_dir) { warn "You must specify a different input and output directory.\n"; exit -1; } # Make sure the output directory exists # (It will auto-create it, but for compatibility we should not) -d $out_dir || die "$out_dir: The directory does not exist\n"; # Try to open the file, because Locale::PO doesn't check :-/ open(INPUT, "<$str_file") || die "$str_file: $!\n"; close INPUT; # restores the string list from file $href = Locale::PO->load_file_ashash($str_file); # creates the new tmpl file using the new translation for my $input (@in_files) { die "Assertion failed" unless substr($input, 0, length($in_dir) + 1) eq "$in_dir/"; my $h = TmplTokenizer->new( $input ); $h->set_allow_cformat( 1 ); VerboseWarnings::set_input_file_name $input; my $target = $out_dir . substr($input, length($in_dir)); my $targetdir = $` if $target =~ /[^\/]+$/s; if (!-d $targetdir) { print STDERR "Making directory $targetdir..."; # creates with rwxrwxr-x permissions mkdir($targetdir, 0775) || warn_normal "$targetdir: $!", undef; } print STDERR "Creating $target...\n"; open( OUTPUT, ">$target" ) || die "$target: $!\n"; text_replace( $h, *OUTPUT ); close OUTPUT; } } else { usage_error('Unknown action specified.'); } exit 0; ############################################################################### =head1 SYNOPSIS ./tmpl_process3.pl [ I ] =head1 DESCRIPTION This is an experimental version of the tmpl_process.pl script, using standard gettext-style PO files. Currently, the create, update, and install actions have all been reimplemented and seem to work. The create action calls xgettext.pl to do the actual work; the update action calls xgettext.pl and msgmerge(1) to do the actual work. The script can detect directives embedded inside what appears to be a full sentence (this actual work being done by TmplTokenizer(3)); these larger patterns appear in the translation file as c-format strings with %s. =head1 BUGS The --help option has not been implemented yet. There are probably some real bugs too, since this has not been tested very much. xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. The script currently does not check carefully whether these dependent commands are present. Locale::PO(3) has a lot of bugs. It can neither parse nor generate GNU PO files properly; a couple of workarounds have been written in TmplTokenizer and more is likely to be needed (e.g., to get rid of the "Strange line" warning for #~). =head1 SEE ALSO xgettext.pl, msgmerge(1), Locale::PO(3), translator_doc.txt =cut --- NEW FILE --- #!/usr/bin/perl =head1 NAME xgettext.pl - xgettext(1)-like interface for .tmpl strings extraction =cut use strict; use Getopt::Long; use Locale::PO; use TmplTokenizer; use VerboseWarnings; use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); use vars qw( %text ); ############################################################################### sub remember ($$) { my($token, $string) = @_; $text{$string} = [] unless defined $text{$string}; push @{$text{$string}}, $token; } ############################################################################### sub string_list () { my @t = keys %text; # The real gettext tools seems to sort case sensitively; I don't know why @t = sort { $a cmp $b } @t if $sort eq 's'; @t = sort { my @aa = sort { $a->pathname cmp $b->pathname || $a->line_number <=> $b->line_number } @{$text{$a}}; my @bb = sort { $a->pathname cmp $b->pathname || $a->line_number <=> $b->line_number } @{$text{$b}}; $aa[0]->pathname cmp $bb[0]->pathname || $aa[0]->line_number <=> $bb[0]->line_number; } @t if $sort eq 'F'; return @t; } ############################################################################### sub text_extract (*) { my($h) = @_; for (;;) { my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { #$t = TmplTokenizer::trim $t; remember( $s, $t ) if $t =~ /\S/s; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { #$t = TmplTokenizer::trim $t; remember( $s, $s->form ) if $s->form =~ /\S/s; } elsif ($kind eq TmplTokenType::TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; remember( $s, $val ) if $val =~ /\S/s; } } } } } ############################################################################### sub generate_strings_list () { # Emit all extracted strings. # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (string_list) { printf OUTPUT "%s\n", $t unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } ############################################################################### sub generate_po_file () { # We don't emit the Plural-Forms header; it's meaningless for us print OUTPUT <, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\\n" "POT-Creation-Date: 2004-02-05 20:55-0500\\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n" "Last-Translator: FULL NAME \\n" "Language-Team: LANGUAGE \\n" "MIME-Version: 1.0\\n" "Content-Type: text/plain; charset=CHARSET\\n" "Content-Transfer-Encoding: 8bit\\n" EOF my $directory_re = quotemeta("$directory/"); for my $t (string_list) { next if TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; my $cformat_p; for my $token (@{$text{$t}}) { my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( $t ); printf OUTPUT "msgstr \"\"\n\n"; } } ############################################################################### sub usage ($) { my($exitcode) = @_; my $h = $exitcode? *STDERR: *STDOUT; print $h < \$directory, 'f|files-from=s' => \$files_from, 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, 'output|o=s' => \$output, 's|sort-output' => sub { $sort = 's' }, 'F|sort-by-file' => sub { $sort = 'F' }, 'help' => sub { usage(0) }, ) || usage_error; VerboseWarnings::set_application_name $0; VerboseWarnings::set_pedantic_mode $pedantic_p; usage_error('Missing mandatory option -f') unless defined $files_from; $directory = '.' unless defined $directory; if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; } else { open(OUTPUT, ">&STDOUT"); } open(INPUT, "<$files_from") || die "$files_from: $!\n"; while () { chomp; my $h = TmplTokenizer->new( "$directory/$_" ); $h->set_allow_cformat( 1 ); VerboseWarnings::set_input_file_name "$directory/$_"; text_extract( $h ); } close INPUT; generate_po_file; warn "This input will not work with Mozilla standards-compliant mode\n", undef if TmplTokenizer::syntaxerror_p; exit(-1) if TmplTokenizer::fatal_p; ############################################################################### =head1 DESCRIPTION This is an experimental script based on the modularized text-extract2.pl script. It has behaviour similar to xgettext(1), and generates gettext-compatible output files. A gettext-like format provides the following advantages: =over =item - (Future goal) Translation to non-English-like languages with different word order: gettext's c-format strings can theoretically be emulated if we are able to do some analysis on the .tmpl input and treat in a way similar to %s. =item - Context for the extracted strings: the gettext format provides the filenames and line numbers where each string can be found. The translator can read the source file and see the context, in case the string by itself can mean several different things. =item - Place for the translator to add comments about the translations. =item - Gettext-compatible tools, if any, might be usable if we adopt the gettext format. =back Right now it does about the same thing as text-extract2.pl but generates gettext-style output; however, because it is scanner- instead of parser-based, it is able to address the 4 weaknesses listed in translator_doc.txt. Ultimately, the goal is to make this able to do some kind of simple analysis on the input to produce gettext-style output with c-format strings, in order to facilitate translation to languages with a different word order than English. When the above is finished, the generated po file may contain some HTML tags in addition to %s strings. If you want to generate GNOME-style POTFILES.in files, such files (passed to -f) can be generated thus: (cd ../.. && find koha-tmpl/opac-tmpl/default/en -name \*.inc -o -name \*.tmpl) > opac/POTFILES.in (cd ../.. && find koha-tmpl/intranet-tmpl/default/en -name \*.inc -o -name \*.tmpl) > intranet/POTFILES.in This is, however, quite pointless, because the "create" and "update" actions have already been implemented in tmpl_process3.pl. =head1 SEE ALSO tmpl_process.pl, xgettext(1), Locale::PO(3), translator_doc.txt =head1 BUGS There probably are some. Bugs related to scanning of tags seem to be especially likely to be present. Its diagnostics are probably too verbose. When a within a JavaScript-related attribute is detected, the script currently displays no warnings at all. It might be good to display some kind of warning. Its sort order (-s option) seems to be different than the real xgettext(1)'s sort option. This will result in translation strings inside the generated PO file spuriously moving about when tmpl_process3.pl calls msgmerge(1) to update the PO file. =cut Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplToken.pm 17 Feb 2004 05:42:27 -0000 1.2 --- TmplToken.pm 19 Feb 2004 21:24:30 -0000 1.3 *************** *** 68,71 **** --- 68,104 ---- } + # only meaningful for TEXT_PARAMETRIZED tokens + sub children { + my $this = shift; + return $this->{'_kids'}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub set_children { + my $this = shift; + $this->{'_kids'} = ref $_[0] eq 'ARRAY'? $_[0]: \@_; + return $this; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + # FIXME: DIRECTIVE is not necessarily TMPL_VAR !! + sub parameters { + my $this = shift; + return map { $_->type == TmplTokenType::DIRECTIVE? $_: ()} @{$this->{'_kids'}}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub form { + my $this = shift; + return $this->{'_form'}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub set_form { + my $this = shift; + $this->{'_form'} = $_[0]; + return $this; + } + ############################################################################### Index: TmplTokenType.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenType.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplTokenType.pm 17 Feb 2004 03:02:39 -0000 1.2 --- TmplTokenType.pm 19 Feb 2004 21:24:30 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- This is a Java-style "safe enum" singleton class for types of TmplToken objects. + The predefined constants are =cut *************** *** 25,28 **** --- 26,30 ---- @EXPORT_OK = qw( &TEXT + &TEXT_PARAMETRIZED &CDATA &TAG *************** *** 36,40 **** ############################################################################### ! use vars qw( $_text $_cdata $_tag $_decl $_pi $_directive $_comment $_unknown ); BEGIN { --- 38,43 ---- ############################################################################### ! use vars qw( $_text $_text_parametrized $_cdata ! $_tag $_decl $_pi $_directive $_comment $_null $_unknown ); BEGIN { *************** *** 47,58 **** return $self; }; ! $_text = &$new(0, 'TEXT'); ! $_cdata = &$new(1, 'CDATA'); ! $_tag = &$new(2, 'TAG'); ! $_decl = &$new(3, 'DECL'); ! $_pi = &$new(4, 'PI'); ! $_directive = &$new(5, 'DIRECTIVE'); ! $_comment = &$new(6, 'COMMENT'); ! $_unknown = &$new(7, 'UNKNOWN'); } --- 50,62 ---- return $self; }; ! $_text = &$new(0, 'TEXT'); ! $_text_parametrized = &$new(8, 'TEXT-PARAMETRIZED'); ! $_cdata = &$new(1, 'CDATA'); ! $_tag = &$new(2, 'TAG'); ! $_decl = &$new(3, 'DECL'); ! $_pi = &$new(4, 'PI'); ! $_directive = &$new(5, 'DIRECTIVE'); ! $_comment = &$new(6, 'COMMENT'); ! $_unknown = &$new(7, 'UNKNOWN'); } *************** *** 62,75 **** } ! sub TEXT () { $_text } ! sub CDATA () { $_cdata } ! sub TAG () { $_tag } ! sub DECL () { $_decl } ! sub PI () { $_pi } ! sub DIRECTIVE () { $_directive } ! sub COMMENT () { $_comment } ! sub UNKNOWN () { $_unknown } ############################################################################### 1; --- 66,128 ---- } ! sub TEXT () { $_text } ! sub TEXT_PARAMETRIZED () { $_text_parametrized } ! sub CDATA () { $_cdata } ! sub TAG () { $_tag } ! sub DECL () { $_decl } ! sub PI () { $_pi } ! sub DIRECTIVE () { $_directive } ! sub COMMENT () { $_comment } ! sub UNKNOWN () { $_unknown } ############################################################################### + =over + + =item TEXT + + normal text (#text in the DTD) + + =item TEXT_PARAMETRIZED + + parametrized normal text + (result of simple recognition of text interspersed with directives; + this has to be explicitly enabled in the scanner) + + =item CDATA + + normal text (CDATA in the DTD) + + =item TAG + + something that has the form of an HTML tag + + =item DECL + + something that has the form of an SGML declaration + + =item PI + + something that has the form of an SGML processing instruction + + =item DIRECTIVE + + a HTML::Template directive (whether or not embedded in an SGML comment) + + =item COMMENT + + something that has the form of an HTML comment + (and is not recognized as an HTML::Template directive) + + =item UNKNOWN + + something that is not recognized at all by the scanner + + =back + + Note that end of file is currently represented by undef, + instead of a constant predefined by this module. + + =cut + 1; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** TmplTokenizer.pm 18 Feb 2004 06:56:19 -0000 1.10 --- TmplTokenizer.pm 19 Feb 2004 21:24:30 -0000 1.11 *************** *** 23,31 **** This module is a simple-minded attempt at such a scanner. - =head1 HISTORY - - This tokenizer is mostly based - on Ambrose's hideous Perl script known as subst.pl. - =cut --- 23,26 ---- *************** *** 98,101 **** --- 93,98 ---- sub CDATA_CLOSE () {'cdata-close'} + sub ALLOW_CFORMAT_P () {'allow-cformat-p'} + sub new { my $this = shift; *************** *** 171,174 **** --- 168,176 ---- } + sub allow_cformat_p { + my $this = shift; + return $this->{+ALLOW_CFORMAT_P}; + } + # Simple setters *************** *** 232,235 **** --- 234,243 ---- } + sub set_allow_cformat { + my $this = shift; + $this->{+ALLOW_CFORMAT_P} = $_[0]; + return $this; + } + ############################################################################### *************** *** 306,310 **** $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it) = (TmplTokenType::TEXT, $&); $this->_set_readahead( $' ); --- 314,318 ---- $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])*(?:[^<\s])/s) { # non-space normal text ($kind, $it) = (TmplTokenType::TEXT, $&); $this->_set_readahead( $' ); *************** *** 324,331 **** } } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! ($kind, $it) = (TmplTokenType::TAG, "$1>"); ! $this->_set_readahead( $3 ); ! $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $this->line_number_start if $2 eq ''; } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); --- 332,346 ---- } } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! # If we detect a "closed start tag" but we know that the ! # following token looks like a TMPL_VAR, don't stop ! my($head, $tail, $post) = ($1, $2, $3); ! if ($tail eq '' && $post =~ $re_tmpl_var) { ! warn_normal "Possible SGML \"closed start tag\" notation: $head<\n", $this->line_number; ! } else { ! ($kind, $it) = (TmplTokenType::TAG, "$head>"); ! $this->_set_readahead( $post ); ! $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; ! } } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); *************** *** 348,352 **** $kind = TmplTokenType::COMMENT if $it =~ /^).)*-->/; if ($kind == TmplTokenType::COMMENT && $it =~ /^).)*-->/; if ($kind == TmplTokenType::COMMENT && $it =~ /^ ! "> ! "&bib=""&bi="""> --- 81,87 ---- ! "> ! &bib=&bi="> From acli at users.sourceforge.net Fri Feb 20 03:49:28 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple additem-nomarc.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/acqui.simple Modified Files: additem-nomarc.tmpl Log Message: Make the translation tool happier. Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** additem-nomarc.tmpl 9 Dec 2003 10:29:07 -0000 1.6 --- additem-nomarc.tmpl 20 Feb 2004 02:49:26 -0000 1.7 *************** *** 174,178 **** LCCN: ! --- 174,178 ---- LCCN: ! From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbasket2.tmpl,1.8,1.9 supplier.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/acqui Modified Files: newbasket2.tmpl supplier.tmpl Log Message: Make the translation tool happier. Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** newbasket2.tmpl 11 Feb 2004 09:03:47 -0000 1.8 --- newbasket2.tmpl 20 Feb 2004 02:49:26 -0000 1.9 *************** *** 4,16 **** ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! "> ! //images/1uparrow.png" border=0 align=right alt="View Basket">
    > --- 4,16 ---- ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! "> ! //images/1uparrow.png" border=0 align=right alt="View Basket"> > Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** supplier.tmpl 11 Feb 2004 09:03:47 -0000 1.9 --- supplier.tmpl 20 Feb 2004 02:49:26 -0000 1.10 *************** *** 25,29 **** Postal Address ! --- 25,29 ---- Postal Address ! *************** *** 99,103 **** Active ! Inactive --- 99,103 ---- Active ! Inactive From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.16,1.17 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/circ Modified Files: circulation.tmpl Log Message: Make the translation tool happier. Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** circulation.tmpl 11 Feb 2004 09:03:46 -0000 1.16 --- circulation.tmpl 20 Feb 2004 02:49:26 -0000 1.17 *************** *** 242,246 **** CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment ! --- 242,246 ---- CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment ! > From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport AcceptMarcUpload.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/marcimport Modified Files: AcceptMarcUpload.tmpl Log Message: Make the translation tool happier. Index: AcceptMarcUpload.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AcceptMarcUpload.tmpl 9 Dec 2003 10:29:03 -0000 1.2 --- AcceptMarcUpload.tmpl 20 Feb 2004 02:49:27 -0000 1.3 *************** *** 23,27 **** ! Name this set of MARC records: --- 23,27 ---- ! "> Name this set of MARC records: From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes opac-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/includes Modified Files: opac-top.inc Log Message: Make the translation tool happier. Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** opac-top.inc 9 Dec 2003 10:29:04 -0000 1.7 --- opac-top.inc 20 Feb 2004 02:49:27 -0000 1.8 *************** *** 23,27 **** --> ! --- 23,27 ---- --> !
    *************** *** 75,78 **** !
    --- 75,78 ---- !
    From acli at users.sourceforge.net Fri Feb 20 03:49:30 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members jmemberentry.tmpl,1.8,1.9 memberentry.tmpl,1.22,1.23 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/members Modified Files: jmemberentry.tmpl memberentry.tmpl Log Message: Make the translation tool happier. Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** jmemberentry.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- jmemberentry.tmpl 20 Feb 2004 02:49:27 -0000 1.9 *************** *** 31,35 ****
    --- 61,65 ---- Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** detail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 --- detail.tmpl 20 Feb 2004 02:49:26 -0000 1.11 *************** *** 15,19 ****

    &bib=&bi=">http://
    &bib=&bi=">http://
    ! ! ! !
    --- 15,19 ----

    ! ! ! ! ! ! ! !
    Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** moredetail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 --- moredetail.tmpl 20 Feb 2004 02:49:26 -0000 1.11 *************** *** 18,22 **** > > ! --- 18,22 ---- > > !
    *************** *** 27,31 **** bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    //images/fileopen.png"> ! //images/edittrash.png">
    --- 27,31 ----     		//images/fileopen.png"> ! //images/edittrash.png">
    Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** searchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.8 --- searchresults.tmpl 20 Feb 2004 02:49:26 -0000 1.9 *************** *** 62,70 ****
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    ! &=&type=opacintra>Previous Records   --- 62,70 ----
    ! ! bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif">
    ! &=&type=opacintra">Previous Records   *************** *** 73,77 **** ! &=&type=opacintra>Next Records   --- 73,77 ---- ! &=&type=opacintra">Next Records   From acli at users.sourceforge.net Fri Feb 20 03:49:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,1.18,1.19 categoryitem.tmpl,1.8,1.9 checkmarc.tmpl,1.7,1.8 koha2marclinks.tmpl,1.10,1.11 marc_subfields_structure.tmpl,1.24,1.25 marctagstructure.tmpl,1.20,1.21 thesaurus.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/parameters Modified Files: authorised_values.tmpl categoryitem.tmpl checkmarc.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl thesaurus.tmpl Log Message: Make the translation tool happier. Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** authorised_values.tmpl 11 Feb 2004 09:02:55 -0000 1.18 --- authorised_values.tmpl 20 Feb 2004 02:49:27 -0000 1.19 *************** *** 2,6 **** !

    --- 2,6 ---- !

    *************** *** 30,34 **** ! --- 30,34 ---- !
    *************** *** 47,51 **** !

    Authorised values admin

    --- 47,51 ---- !

    Authorised values admin

    Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** categoryitem.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- categoryitem.tmpl 20 Feb 2004 02:49:27 -0000 1.9 *************** *** 288,292 **** ! ! ! Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** checkmarc.tmpl 11 Feb 2004 09:02:55 -0000 1.7 --- checkmarc.tmpl 20 Feb 2004 02:49:27 -0000 1.8 *************** *** 6,10 **** ! --- 6,10 ---- ! *************** *** 19,23 **** ! --- 19,23 ---- ! *************** *** 33,37 **** ! --- 33,37 ---- ! *************** *** 45,49 **** ! --- 45,49 ---- ! *************** *** 59,63 **** ! --- 59,63 ---- ! *************** *** 71,75 **** ! --- 71,75 ---- ! *************** *** 85,89 **** ! --- 85,89 ---- ! *************** *** 99,103 **** ! --- 99,103 ---- ! *************** *** 114,118 **** ! --- 114,118 ---- ! Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** koha2marclinks.tmpl 11 Feb 2004 09:02:55 -0000 1.10 --- koha2marclinks.tmpl 20 Feb 2004 02:49:28 -0000 1.11 *************** *** 2,11 **** !

    Choose and validate 1 of the following for .

    EditDelete --- 288,293 ---- EditDelete
    Result
    Result
    ! ! ! --- 21,29 ---- ! ! From acli at users.sourceforge.net Sun Feb 22 07:46:26 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 22:46:26 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.17,1.18 intranet.zh_TW,1.4,1.5 xgettext.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13681 Modified Files: TmplTokenizer.pm intranet.zh_TW xgettext.pl Log Message: Templates with French characters were not handled properly in the install step. This is now fixed. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** TmplTokenizer.pm 22 Feb 2004 05:18:52 -0000 1.17 --- TmplTokenizer.pm 22 Feb 2004 06:46:15 -0000 1.18 *************** *** 536,540 **** $s =~ s/([\\"])/\\\1/gs; $s =~ s/\n/\\n/g; ! $s =~ s/[\177-\377]/ sprintf("\\%03o", ord($&)) /egs; return "\"$s\""; } --- 536,540 ---- $s =~ s/([\\"])/\\\1/gs; $s =~ s/\n/\\n/g; ! #$s =~ s/[\177-\377]/ sprintf("\\%03o", ord($&)) /egs; return "\"$s\""; } *************** *** 581,584 **** --- 581,621 ---- } + use vars qw( @latin1_utf8 ); + @latin1_utf8 = ( + "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", + "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", + "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", + "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", + "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", + "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", + "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", + "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", + "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", + "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", + "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", + "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", + "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", + "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", + "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", + "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", + "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", + "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", + "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", + "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", + "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", + "\303\276", "\303\277" ); + + sub charset_convert ($$$) { + my($s, $charset_in, $charset_out) = @_; + if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now + ; + } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { + $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; + } elsif ($charset_in ne $charset_out) { + VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; + } + return $s; + } + ############################################################################### Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** intranet.zh_TW 20 Feb 2004 09:32:14 -0000 1.4 --- intranet.zh_TW 22 Feb 2004 06:46:16 -0000 1.5 *************** *** 4,7 **** --- 4,10 ---- # Copyright 2004 Ambrose Li # + # FIXME words tentatively translated: active, illustration, illustrator, inactive + # FIXME "request", "reserve" should be é ç´„ [http://www.tpml.edu.tw/chinese/service/service.htm] + # msgid "" msgstr "" *************** *** 39,52 **** [...3717 lines suppressed...] - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:43 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:44 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:45 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:46 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:47 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:48 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:49 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 - msgid "||" - msgstr "||" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 --- 7096,7099 ---- *************** *** 7221,7222 **** --- 7108,7110 ---- "Help" msgstr "" + Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** xgettext.pl 22 Feb 2004 05:18:52 -0000 1.2 --- xgettext.pl 22 Feb 2004 06:46:17 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- use vars qw( $convert_from ); use vars qw( $files_from $directory $output $sort ); + use vars qw( $extract_all_p ); use vars qw( $pedantic_p ); use vars qw( %text %translation ); *************** *** 21,59 **** ############################################################################### ! use vars qw( @latin1_utf8 ); ! @latin1_utf8 = ( ! "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", ! "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", ! "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", ! "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", ! "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", ! "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", ! "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", ! "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", ! "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", ! "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", ! "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", ! "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", ! "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", ! "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", ! "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", ! "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", ! "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", ! "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", ! "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", ! "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", ! "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", ! "\303\276", "\303\277" ); ! ! sub charset_convert ($) { ! my($s) = @_; ! if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now ! ; ! } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { ! $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; ! } elsif ($charset_in ne $charset_out) { ! VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; ! } ! return $s; } --- 22,37 ---- ############################################################################### ! sub negligible_p ($) { ! my($t) = @_; # a string ! # Don't emit pure whitespace, pure numbers, pure punctuation, ! # single letters, or TMPL_VAR's. ! # Punctuation should arguably be translated. But without context ! # they are untranslatable. ! return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR ! || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\.,:;'"%\(\)\[\]\|]+$/ # pure punctuation w/o context ! || $t =~ /^[A-Za-z]$/ # single letters ! ); } *************** *** 118,125 **** sub generate_strings_list () { # Emit all extracted strings. - # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (string_list) { ! printf OUTPUT "%s\n", $t ! unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } --- 96,101 ---- sub generate_strings_list () { # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t unless negligible_p($t); } } *************** *** 152,156 **** my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; my $cformat_p; for my $token (@{$text{$t}}) { --- 128,132 ---- my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { *************** *** 162,166 **** } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( charset_convert $t ); printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? TmplTokenizer::quote_po( $translation{$t} ): "\"\""); --- 138,143 ---- } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po ! TmplTokenizer::charset_convert $t, $charset_in, $charset_out; printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? TmplTokenizer::quote_po( $translation{$t} ): "\"\""); *************** *** 201,204 **** --- 178,182 ---- } } + # The following assumption is correct; that's what HTML::Template assumes if (!defined $charset_in) { $charset_in = $charset_out = TmplTokenizer::charset_canon 'iso8859-1'; *************** *** 224,227 **** --- 202,206 ---- HTML::Template options: + -a, --extract-all Extract all strings --pedantic-warnings Issue warnings even for detected problems which are likely to be harmless *************** *** 249,252 **** --- 228,232 ---- Getopt::Long::config qw( bundling no_auto_abbrev ); GetOptions( + 'a|extract-all' => \$extract_all_p, 'charset=s' => sub { $charset_in = $charset_out = $_[1] }, # INTERNAL 'convert-from=s' => \$convert_from, From acli at users.sourceforge.net Sun Feb 22 08:00:19 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 23:00:19 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15661 Modified Files: TmplTokenizer.pm Log Message: Ugly hack to get rid of the close tag in pathetic "foo %s"-like strings Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** TmplTokenizer.pm 22 Feb 2004 06:46:15 -0000 1.18 --- TmplTokenizer.pm 22 Feb 2004 07:00:16 -0000 1.19 *************** *** 486,489 **** --- 486,503 ---- push @{$this->{_queue}}, pop @structure; } + # FIXME: If the last token is a close tag but there are no tags + # FIXME: before it, drop the close tag back into the queue. This + # FIXME: is an ugly hack to get rid of "foo %s" type mess. + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TAG + && $structure[$#structure]->string =~ /^<\//) { + my $has_other_tags_p = 0; + for (my $i = 0; $i < $#structure; $i += 1) { + $has_other_tags_p = 1 + if $structure[$i]->type == TmplTokenType::TAG; + last if $has_other_tags_p; + } + push @{$this->{_queue}}, pop @structure unless $has_other_tags_p + } if (@structure < 2) { # Nothing to do From acli at users.sourceforge.net Sun Feb 22 09:18:30 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:18:30 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.19,1.20 tmpl_process3.pl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27216 Modified Files: TmplTokenizer.pm tmpl_process3.pl Log Message: The French character handling fix for tmpl_process3 was not checked in for some reason. Try to remove trailing ( in strings too. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** TmplTokenizer.pm 22 Feb 2004 07:00:16 -0000 1.19 --- TmplTokenizer.pm 22 Feb 2004 08:18:27 -0000 1.20 *************** *** 443,446 **** --- 443,482 ---- } + sub _optimize { + my $this = shift; + my @structure = @_; + my $undo_trailing_blanks = sub { + for (my $i = $#structure; $i >= 0; $i -= 1) { + last if $structure[$i]->type != TmplTokenType::TEXT; + last if !blank_p($structure[$i]->string); + push @{$this->{_queue}}, pop @structure; + } + }; + # FIXME: If the last token is a close tag but there are no tags + # FIXME: before it, drop the close tag back into the queue. This + # FIXME: is an ugly hack to get rid of "foo %s" type mess. + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TAG + && $structure[$#structure]->string =~ /^<\//s) { + my $has_other_tags_p = 0; + printf STDERR "last token %d is type %s: %s\n", $#structure, $structure[$#structure]->type->to_string, $structure[$#structure]->string; + for (my $i = 0; $i < $#structure; $i += 1) { + printf STDERR "token %d is type %s: %s\n", $i, $structure[$i]->type->to_string, $structure[$i]->string; + $has_other_tags_p = 1 if $structure[$i]->type == TmplTokenType::TAG; + last if $has_other_tags_p; + } + push @{$this->{_queue}}, pop @structure unless $has_other_tags_p; + &$undo_trailing_blanks; + } + # FIXME: Do the same ugly hack for the last token being a ( or [ + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TEXT + && $structure[$#structure]->string =~ /^[\(\[]$/) { # not )] + push @{$this->{_queue}}, pop @structure; + &$undo_trailing_blanks; + } + return @structure; + } + sub next_token { my $this = shift; *************** *** 486,503 **** push @{$this->{_queue}}, pop @structure; } ! # FIXME: If the last token is a close tag but there are no tags ! # FIXME: before it, drop the close tag back into the queue. This ! # FIXME: is an ugly hack to get rid of "foo %s" type mess. ! if (@structure >= 2 ! && $structure[$#structure]->type == TmplTokenType::TAG ! && $structure[$#structure]->string =~ /^<\//) { ! my $has_other_tags_p = 0; ! for (my $i = 0; $i < $#structure; $i += 1) { ! $has_other_tags_p = 1 ! if $structure[$i]->type == TmplTokenType::TAG; ! last if $has_other_tags_p; ! } ! push @{$this->{_queue}}, pop @structure unless $has_other_tags_p ! } if (@structure < 2) { # Nothing to do --- 522,526 ---- push @{$this->{_queue}}, pop @structure; } ! @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** tmpl_process3.pl 22 Feb 2004 05:18:52 -0000 1.3 --- tmpl_process3.pl 22 Feb 2004 08:18:27 -0000 1.4 *************** *** 34,37 **** --- 34,38 ---- my($s) = @_; my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; + $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); return defined $href->{$key} && !$href->{$key}->fuzzy *************** *** 147,150 **** --- 148,154 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; + # try to make sure .po files are backed up (see BUGS) + $ENV{VERSION_CONTROL} = 't'; + # keep the buggy Locale::PO quiet if it says stupid things $SIG{__WARN__} = sub { *************** *** 320,323 **** --- 324,330 ---- dependent commands are present. + If xgettext.pl is interrupted by the user, a corrupted po file + will result. This is very seriously wrong. + Locale::PO(3) has a lot of bugs. It can neither parse nor generate GNU PO files properly; a couple of workarounds have From acli at users.sourceforge.net Sun Feb 22 09:49:34 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:34 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305/members Modified Files: moremember.tmpl Log Message: Grammatical correction Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** moremember.tmpl 11 Feb 2004 09:02:55 -0000 1.25 --- moremember.tmpl 22 Feb 2004 08:49:32 -0000 1.26 *************** *** 137,145 **** ! ! ! ! ! --- 137,145 ---- ! ! ! ! ! From acli at users.sourceforge.net Sun Feb 22 09:49:35 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters thesaurus.tmpl,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305/parameters Modified Files: thesaurus.tmpl Log Message: Grammatical correction Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** thesaurus.tmpl 20 Feb 2004 02:49:28 -0000 1.19 --- thesaurus.tmpl 22 Feb 2004 08:49:32 -0000 1.20 *************** *** 88,92 **** "> ! --- 88,92 ---- "> ! *************** *** 99,103 ****

    Manages thesaurus and authorities files.

      ! Dig: see data depending of this one
      Related: see other forms of this authority entry

    --- 99,103 ----

    Manages thesaurus and authorities files.

      ! Dig: see data depending on this one
      Related: see other forms of this authority entry

    From acli at users.sourceforge.net Sun Feb 22 09:49:34 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:34 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305 Modified Files: request.tmpl Log Message: Grammatical correction Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** request.tmpl 11 Feb 2004 09:01:41 -0000 1.11 --- request.tmpl 22 Feb 2004 08:49:31 -0000 1.12 *************** *** 44,53 ****
    --- 2,11 ---- !

    Choose and validate 1 of the following for .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    *************** *** 20,24 ****
    --- 20,24 ----
    *************** *** 33,37 ****
    --- 33,37 ----
    *************** *** 46,50 ****
    --- 46,50 ----
    *************** *** 59,63 ****
    --- 59,63 ----
    *************** *** 72,76 ****
    --- 72,76 ----
    *************** *** 85,89 ****
    --- 85,89 ----
    *************** *** 98,102 ****
    --- 98,102 ----
    *************** *** 111,115 ****
    --- 111,115 ----
    *************** *** 124,128 ****
    --- 124,128 ----
    *************** *** 153,157 **** ! MARC links --- 153,157 ---- ! MARC links Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** marc_subfields_structure.tmpl 11 Feb 2004 09:02:55 -0000 1.24 --- marc_subfields_structure.tmpl 20 Feb 2004 02:49:28 -0000 1.25 *************** *** 5,9 **** !

    --- 5,9 ---- !

    *************** *** 44,48 **** ! --- 44,48 ---- !
    *************** *** 59,70 **** ! Data deleted ! ' method=post>"> !

    MARC subfield structure admin for

    *************** *** 77,87 **** ! ! ! ! ! ! ! --- 77,87 ---- ! ! ! ! ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** marctagstructure.tmpl 9 Dec 2003 10:29:01 -0000 1.20 --- marctagstructure.tmpl 20 Feb 2004 02:49:28 -0000 1.21 *************** *** 53,57 **** !

    --- 53,57 ---- !

    *************** *** 71,75 **** !
    Lib Koha field ?Rep ?Mand ?Tab ?Auth value ?Thesaurus ?Val build ?Delete
    Lib Koha field ?Rep ?Mand ?Tab ?Auth value ?Thesaurus ?Val build ?Delete
    --- 71,75 ---- !
    *************** *** 84,88 **** ! Data deleted --- 84,88 ---- ! Data deleted *************** *** 91,95 **** !

    MARC tag structure admin

    --- 91,95 ---- !

    MARC tag structure admin

    Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** thesaurus.tmpl 11 Feb 2004 09:02:55 -0000 1.18 --- thesaurus.tmpl 20 Feb 2004 02:49:28 -0000 1.19 *************** *** 2,6 **** ! Thesaurus management
    --- 2,6 ---- ! Thesaurus management
    *************** *** 34,38 **** !

    ModifyAdd

    --- 34,38 ---- !

    ModifyAdd

    *************** *** 75,79 **** !
    --- 75,79 ---- !
    *************** *** 94,98 **** !

    Thesaurus management

    --- 94,98 ---- !

    Thesaurus management

    From acli at users.sourceforge.net Fri Feb 20 04:01:23 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en default.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941 Modified Files: default.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/default.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** default.tmpl 11 Feb 2004 09:01:41 -0000 1.3 --- default.tmpl 20 Feb 2004 03:01:21 -0000 1.4 *************** *** 24,28 ****

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    From acli at users.sourceforge.net Fri Feb 20 04:01:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbookfund.tmpl,1.20,1.21 aqbudget.tmpl,1.21,1.22 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/parameters Modified Files: aqbookfund.tmpl aqbudget.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** aqbookfund.tmpl 9 Dec 2003 10:29:00 -0000 1.20 --- aqbookfund.tmpl 20 Feb 2004 03:01:21 -0000 1.21 *************** *** 5,9 **** !
    You Searched for


    --- 5,9 ---- !
    You Searched for


    Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** aqbudget.tmpl 11 Feb 2004 09:02:55 -0000 1.21 --- aqbudget.tmpl 20 Feb 2004 03:01:21 -0000 1.22 *************** *** 5,9 **** !
    You Searched for


    --- 5,9 ---- !
    You Searched for


    From acli at users.sourceforge.net Fri Feb 20 04:01:23 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/acqui Modified Files: acquire.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** acquire.tmpl 11 Feb 2004 09:03:47 -0000 1.8 --- acquire.tmpl 20 Feb 2004 03:01:21 -0000 1.9 *************** *** 147,151 **** ! --- 147,151 ---- ! From acli at users.sourceforge.net Fri Feb 20 04:01:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes issues-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/includes Modified Files: issues-top.inc Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** issues-top.inc 11 Feb 2004 09:02:56 -0000 1.7 --- issues-top.inc 20 Feb 2004 03:01:21 -0000 1.8 *************** *** 240,266 **** --- 240,267 ---- *************** *** 271,301 **** --- 272,302 ---- *************** *** 326,331 ****
    !

    Logged in as: [Log Out]

    !

    Log In to Koha

    --- 327,332 ----
    !

    Logged in as: [Log Out]

    !

    Log In to Koha

    From acli at users.sourceforge.net Fri Feb 20 05:38:05 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 20:38:05 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.13,1.14 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18383 Modified Files: TmplTokenizer.pm Log Message: Support %0.0s notation so that we can omit the %s as in Year%s for the Chinese translation. (This won't work for all languages; ultimately the English templates must be fixed.) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** TmplTokenizer.pm 20 Feb 2004 02:48:39 -0000 1.13 --- TmplTokenizer.pm 20 Feb 2004 04:38:02 -0000 1.14 *************** *** 546,554 **** $fmt = $'; $it .= '%'; ! } elsif ($fmt =~ /^%(?:(\d+)\$)?s/) { $n += 1; ! my $i = (defined $1? $1: $n) - 1; $fmt = $'; ! $it .= $params[$i] } elsif ($fmt =~ /^%[^%a-zA-Z]*[a-zA-Z]/) { $fmt = $'; --- 546,560 ---- $fmt = $'; $it .= '%'; ! } elsif ($fmt =~ /^%(?:(\d+)\$)?(?:(\d+)(?:\.(\d+))?)?s/) { $n += 1; ! my($i, $width, $prec) = ((defined $1? $1: $n), $2, $3); $fmt = $'; ! if (!defined $width && !defined $prec) { ! $it .= $params[$i] ! } elsif (defined $width && defined $prec && !$width && !$prec) { ! ; ! } else { ! die "Unsupported precision specification in format: $&\n"; #XXX ! } } elsif ($fmt =~ /^%[^%a-zA-Z]*[a-zA-Z]/) { $fmt = $'; From acli at users.sourceforge.net Fri Feb 20 05:38:38 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 20:38:38 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,NONE,1.1 opac.zh_TW,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18555 Added Files: intranet.zh_TW opac.zh_TW Log Message: Preliminary checkin --- NEW FILE --- # Koha INTRANET module, traditional Chinese translation # Copyright (C) 2000-2004 Katipo Communications # This file is distributed under the same license as the Koha package. # Copyright 2004 Ambrose Li # msgid "" msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-19 17:20-0500\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl:29 #, c-format msgid "\" %s" [...7251 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:33 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:34 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:36 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:37 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:38 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:39 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:40 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:41 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:42 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:43 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:44 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:45 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:46 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:47 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:48 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:49 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" msgstr "" --- NEW FILE --- # Koha OPAC module, traditional Chinese translation # Copyright (C) 2000-2004 Katipo Communications # This file is distributed under the same license as the Koha package. # Copyright 2004 Ambrose Li # msgid "" msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:10 #, c-format msgid "" [...975 lines suppressed...] msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc:8 msgid "||" msgstr "" #~ msgid "BARCODE" #~ msgstr "æ¢ç¢¼" #~ msgid "Notes:" #~ msgstr "備註：" #~ msgid "Pages:" #~ msgstr "é æ•¸ï¼š" #~ msgid "Year :" #~ msgstr "年：" #~ msgid "You have" #~ msgstr "您有" From acli at users.sourceforge.net Fri Feb 20 07:16:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 22:16:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1235/koha-tmpl/intranet-tmpl/default/en Modified Files: about.tmpl Log Message: Minor capitalization correction Index: about.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** about.tmpl 9 Dec 2003 10:28:57 -0000 1.7 --- about.tmpl 20 Feb 2004 06:16:28 -0000 1.8 *************** *** 41,45 **** Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray and Turo Technology LLP, england (quality control, installer & updater)
    Nicolas Morin, French Translation
    --- 41,45 ---- Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray and Turo Technology LLP, England (quality control, installer & updater)
    Nicolas Morin, French Translation
    From acli at users.sourceforge.net Fri Feb 20 08:04:15 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:04:15 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.1,1.2 opac.zh_TW,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9425 Modified Files: intranet.zh_TW opac.zh_TW Log Message: Updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.zh_TW 20 Feb 2004 04:38:36 -0000 1.1 --- intranet.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 *************** *** 36,40 **** #, c-format msgid "$%s" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:15 --- 36,40 ---- #, c-format msgid "$%s" ! msgstr "$%s" [...3835 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:37 msgid "z3950 search" ! msgstr "z3950查詢" #: ../../koha-tmpl/intranet-tmpl/default/en/searchheader.tmpl:1 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl:6 msgid "|" ! msgstr "|" #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:9 *************** *** 7288,7290 **** #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" ! msgstr "" --- 7292,7294 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" ! msgstr "||" Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac.zh_TW 20 Feb 2004 04:38:36 -0000 1.1 --- opac.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 *************** *** 457,461 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:9 msgid "FINES & CHARGES" ! msgstr "罰款åŠå…¶ä»–費用" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 457,461 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:9 msgid "FINES & CHARGES" ! msgstr "罰款åŠè²»ç”¨" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 From acli at users.sourceforge.net Fri Feb 20 08:13:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:13:24 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10716 Modified Files: intranet.zh_TW Log Message: Minor update (after changing TmplTokenizer.pm) Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** intranet.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 --- intranet.zh_TW 20 Feb 2004 07:13:21 -0000 1.3 *************** *** 2640,2644 **** #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:5 ! msgid "Data about the current version of Koha for bug reports (or general" msgstr "" --- 2640,2646 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:5 ! msgid "" ! "Data about the current version of Koha for bug reports (or general\n" ! "interest)." msgstr "" *************** *** 3286,3300 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:17 - msgid "Help" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:78 msgid "Henri-Damien Laurent" --- 3288,3291 ---- *************** *** 3574,3581 **** msgstr "借出" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:91 - msgid "Issues:" - msgstr "借出：" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:47 msgid "Issuing Question" --- 3565,3568 ---- *************** *** 3829,3833 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:166 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:78 msgid "Koha field" --- 3816,3819 ---- *************** *** 5488,5495 **** msgstr "還書" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:54 - msgid "Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine" - msgstr "Richard Andersonã€Jeremy Blakeã€Rebecca Holdenã€Olive T. Canine" - #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:50 msgid "Rick Hansen Library" --- 5474,5477 ---- *************** *** 5986,5990 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 ! msgid "The column" msgstr "" --- 5968,5976 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 ! msgid "" ! "The column Koha field shows that the subfield is linked with a Koha " ! "field. Koha can manage a MARC interface, or a Koha interface. This link " ! "ensures that both DB are synchronized, thus you can change from a MARC to a " ! "Koha interface easily." msgstr "" *************** *** 6172,6179 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:87 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:90 msgid "Total" msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:32 --- 6158,6170 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:87 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:17 msgid "Total" msgstr "" + #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:90 + msgid "" + "Total\n" + "Issues:" + msgstr "總借出：" + #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:32 *************** *** 6597,6601 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:10 ! msgid "You must create a new group for your item to be" msgstr "" --- 6588,6594 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:10 ! msgid "" ! "You must create a new group for your item to be\n" ! "added to" msgstr "" *************** *** 6691,6698 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:11 - msgid "added to" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:15 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:39 --- 6684,6687 ---- *************** *** 6703,6710 **** msgid "" "and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay " ! "Thompson, Gynn Lomax," msgstr "" "ä»¥åŠ Simon Blakeã€Amanda Atkins (é‹ä½œç¶“ç†)ã€Olwen Williamsã€Finlay Thompsonã€" ! "Gynn Lomaxã€" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90 --- 6692,6700 ---- msgid "" "and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay " ! "Thompson, Gynn Lomax,\n" ! "\t\t\t\t\t\tRichard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine" msgstr "" "ä»¥åŠ Simon Blakeã€Amanda Atkins (é‹ä½œç¶“ç†)ã€Olwen Williamsã€Finlay Thompsonã€" ! "Gynn Lomaxã€Richard Andersonã€Jeremy Blakeã€Rebecca Holdenã€Olive T. Canine" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90 *************** *** 6867,6874 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:6 - msgid "interest)." - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:28 #, c-format --- 6857,6860 ---- *************** *** 7060,7064 **** #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:90 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:93 - #, fuzzy msgid "search" msgstr "查詢" --- 7046,7049 ---- *************** *** 7068,7078 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 - msgid "" - "shows that the subfield is linked with a Koha field. Koha can manage a MARC " - "interface, or a Koha interface. This link ensures that both DB are " - "synchronized, thus you can change from a MARC to a Koha interface easily." - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:60 msgid "slip" --- 7053,7056 ---- *************** *** 7207,7211 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:10 --- 7185,7188 ---- *************** *** 7215,7219 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:10 --- 7192,7195 ---- *************** *** 7223,7227 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:10 --- 7199,7202 ---- *************** *** 7231,7235 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:10 --- 7206,7209 ---- *************** *** 7239,7243 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc:11 --- 7213,7216 ---- *************** *** 7249,7253 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:10 --- 7222,7225 ---- *************** *** 7257,7261 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:10 --- 7229,7232 ---- *************** *** 7265,7269 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:26 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:27 --- 7236,7239 ---- *************** *** 7293,7294 **** --- 7263,7278 ---- msgid "||" msgstr "||" + + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 + msgid "" + "|| \n" + "Help" + msgstr "" + From acli at users.sourceforge.net Fri Feb 20 08:10:05 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:10:05 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.14,1.15 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10129 Modified Files: TmplTokenizer.pm Log Message: Partially allow combination of several TEXT tokens. It seems that this gives better strings. (Always allowing combinations gives havoc, we currently avoid this by allowing combination only if the first and last tokens are both TEXT.) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** TmplTokenizer.pm 20 Feb 2004 04:38:02 -0000 1.14 --- TmplTokenizer.pm 20 Feb 2004 07:09:47 -0000 1.15 *************** *** 491,498 **** $it->set_form( $form ); $it->set_children( @structure ); ! # } elsif ($nonblank_text_p) { ! # # Combine the strings ! # my $string = join('', map { $_->string } @structure); ! # ; } else { # Requeue the tokens thus seen for re-emitting --- 491,498 ---- $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p && $structure[0]->type == TmplTokenType::TEXT && $structure[$#structure]->type == TmplTokenType::TEXT) { ! # Combine the strings ! my $string = join('', map { $_->string } @structure); ! $it = TmplToken->new($string, TmplTokenType::TEXT, $it->line_number, $it->pathname);; } else { # Requeue the tokens thus seen for re-emitting From acli at users.sourceforge.net Fri Feb 20 08:25:41 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:25:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac.zh_TW,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12550 Modified Files: opac.zh_TW Log Message: Minor updates Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 --- opac.zh_TW 20 Feb 2004 07:25:38 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- "(%s)" msgstr "" + "%s\n" + "(%s)" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:11 *************** *** 59,63 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 msgid "©" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 --- 61,65 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 msgid "©" ! msgstr "©" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 *************** *** 81,84 **** --- 83,88 ---- "%s    " msgstr "" + "æ¢ç¢¼\n" + "%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 *************** *** 145,149 **** #, c-format msgid "ISBN: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 --- 149,153 ---- #, c-format msgid "ISBN: %s" ! msgstr "國際標準書號：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 *************** *** 155,179 **** #, c-format msgid "Item Type: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:79 #, c-format msgid "Item lost: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:37 #, c-format msgid "LCCN: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 ! #, fuzzy, c-format msgid "Last Borrower 1: %s" ! msgstr "最近借出：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:76 ! #, fuzzy, c-format msgid "Last Borrower 2: %s" ! msgstr "最近借出：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:73 --- 159,183 ---- #, c-format msgid "Item Type: %s" ! msgstr "圖書資料類別：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:79 #, c-format msgid "Item lost: %s" ! msgstr "éºå¤±åœ–書資料：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:37 #, c-format msgid "LCCN: %s" ! msgstr "LCCN: %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 ! #, c-format msgid "Last Borrower 1: %s" ! msgstr "最近借書之讀者1：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:76 ! #, c-format msgid "Last Borrower 2: %s" ! msgstr "最近借書之讀者2：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:73 *************** *** 202,206 **** #, c-format msgid "Notes: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:41 --- 206,210 ---- #, c-format msgid "Notes: %s" ! msgstr "備註：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:41 *************** *** 287,291 **** #, c-format msgid "Year : %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:51 --- 291,295 ---- #, c-format msgid "Year : %s" ! msgstr "年份：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:51 *************** *** 487,495 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:89 ! msgid "Issues:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 --- 491,495 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" ! msgstr "繪圖" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 *************** *** 640,644 **** "keyword will be used" msgstr "" ! "注æ„：在一旦輸入了「關éµå­—ã€ï¼Œå³ä½¿åœ¨å…¶ä»–欄ä½è¼¸å…¥äº†å…¶ä»–查詢æ¢ä»¶ï¼Œä¹Ÿåªæœƒä½¿ç”¨é—œéµå­—。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:105 --- 640,645 ---- "keyword will be used" msgstr "" ! "注æ„：在一旦輸入了「關éµå­—ã€ï¼Œå³ä½¿åœ¨å…¶ä»–欄ä½è¼¸å…¥äº†å…¶ä»–查詢æ¢ä»¶ï¼Œä¹Ÿåªæœƒä½¿ç”¨é—œ" ! "éµå­—。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:105 *************** *** 840,845 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 ! msgid "Total" ! msgstr "總共" #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 --- 841,848 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 ! msgid "" ! "Total\n" ! "Issues:" ! msgstr "借書總次數：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 *************** *** 912,923 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:90 ! #, fuzzy, c-format msgid "You have %s items currently issued." ! msgstr "您沒有借出任何圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:117 ! #, fuzzy, c-format msgid "You have %s items currently reserved." ! msgstr "您沒有借出任何圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:112 --- 915,926 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:90 ! #, c-format msgid "You have %s items currently issued." ! msgstr "您目å‰å€Ÿäº† %s 項圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:117 ! #, c-format msgid "You have %s items currently reserved." ! msgstr "您目å‰é è¨‚了 %s 項圖書資料。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:112 *************** *** 944,948 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:10 msgid "Young Adult Fiction" ! msgstr "é’å¹´å°èªª" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 --- 947,951 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:10 msgid "Young Adult Fiction" ! msgstr "é’å¹´å°èªªé¡ž" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 *************** *** 984,988 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 msgid "search" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 --- 987,991 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 msgid "search" ! msgstr "查詢" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 *************** *** 999,1014 **** msgstr "" - #~ msgid "BARCODE" - #~ msgstr "æ¢ç¢¼" - - #~ msgid "Notes:" - #~ msgstr "備註：" - - #~ msgid "Pages:" - #~ msgstr "é æ•¸ï¼š" - - #~ msgid "Year :" - #~ msgstr "年：" - - #~ msgid "You have" - #~ msgstr "您有" --- 1002,1003 ---- From acli at users.sourceforge.net Fri Feb 20 08:52:35 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:52:35 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16902 Modified Files: TmplTokenizer.pm Log Message: Fixed bug where a #cdata on one line won't be scanned properly. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** TmplTokenizer.pm 20 Feb 2004 07:09:47 -0000 1.15 --- TmplTokenizer.pm 20 Feb 2004 07:52:32 -0000 1.16 *************** *** 323,332 **** for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { ! if ($this->_peek_readahead =~ /^$cdata_close/) { ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_set_readahead( $' ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $this->_pop_readahead); $ok_p = 1; } --- 323,337 ---- for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { ! my $next = $this->_pop_readahead; ! if ($next =~ /^$cdata_close/) { ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_push_readahead( $' ); ! $ok_p = 1; ! } elsif ($next =~ /^((?:(?!$cdata_close).)+)($cdata_close)/) { ! ($kind, $it) = (TmplTokenType::TEXT, $1); ! $this->_push_readahead( "$2$'" ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $next); $ok_p = 1; } *************** *** 447,451 **** } else { $it = $this->_next_token_intermediate($h); ! if ($this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? !blank_p( $it->string ): _token_groupable_p( $it ))) { --- 452,456 ---- } else { $it = $this->_next_token_intermediate($h); ! if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? !blank_p( $it->string ): _token_groupable_p( $it ))) { From acli at users.sourceforge.net Fri Feb 20 10:32:18 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Fri, 20 Feb 2004 01:32:18 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3527 Modified Files: intranet.zh_TW Log Message: Updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** intranet.zh_TW 20 Feb 2004 07:13:21 -0000 1.3 --- intranet.zh_TW 20 Feb 2004 09:32:14 -0000 1.4 *************** *** 18,22 **** #, c-format msgid "\" %s" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:41 --- 18,22 ---- #, c-format msgid "\" %s" ! msgstr "\" %s" [...1688 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl:6 *************** *** 7159,7163 **** #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:218 msgid "update" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:108 --- 7104,7108 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:218 msgid "update" ! msgstr "æ›´æ–°" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:108 *************** *** 7276,7278 **** "Help" msgstr "" - --- 7221,7222 ---- From tipaul at users.sourceforge.net Fri Feb 20 11:35:02 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 20 Feb 2004 02:35:02 -0800 Subject: [Koha-cvs] CVS: koha/C4 Catalogue.pm,1.38,1.39 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15487/C4 Modified Files: Catalogue.pm Log Message: bugfix (wrong synch with rel_2_0) Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** Catalogue.pm 11 Feb 2004 08:40:10 -0000 1.38 --- Catalogue.pm 20 Feb 2004 10:34:59 -0000 1.39 *************** *** 99,114 **** my ($basketno,$supplier)=@_; my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblio,biblioitems ! where basketno=? and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber =aqorders.biblioitemnumber and (datecancellationprinted is NULL or datecancellationprinted = ! '0000-00-00')" ! .(($supplier ne '')?" and aqorders.booksellerid=?":"") ! ." group by aqorders.ordernumber"); ! if ($supplier ne '') { ! $sth->execute($basketno,$supplier); ! } else { ! $sth->execute($basketno); } $query.=" order by biblioitems.publishercode"; --- 99,110 ---- my ($basketno,$supplier)=@_; my $dbh = C4::Context->dbh; ! my $query="Select *,biblio.title from aqorders,biblio,biblioitems ! where basketno='$basketno' and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber =aqorders.biblioitemnumber and (datecancellationprinted is NULL or datecancellationprinted = ! '0000-00-00')"; ! if ($supplier ne ''){ ! $query.=" and aqorders.booksellerid='$supplier'"; } $query.=" order by biblioitems.publishercode"; *************** *** 119,126 **** my $i=0; while (my $data=$sth->fetchrow_hashref){ ! push(@results,$data); } $sth->finish; ! return(scalar(@results), at results); } --- 115,123 ---- my $i=0; while (my $data=$sth->fetchrow_hashref){ ! $results[$i]=$data; ! $i++; } $sth->finish; ! return($i, at results); } From kb2qzv at poczta.wp.pl Fri Feb 20 13:39:22 2004 From: kb2qzv at poczta.wp.pl (Benedykt P. Barszcz) Date: Fri, 20 Feb 2004 13:39:22 +0100 Subject: [Koha-cvs] npl theme gorgeuos Message-ID: <1077280762.3248.17.camel@localhost.localdomain> Hi, gorgeous gorgeous gorgeous it is !!! Congrats on the new theme for the intranet interface. What I love out right is the explanation column... It's really informative. I didn't have a chance to find bugs but I like it a lot. thanks for this. I will work on translating it soon. Benedict From kb2qzv at users.sourceforge.net Sat Feb 21 14:07:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 05:07:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl subject.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16316/koha-tmpl/opac-tmpl/default/pl Modified Files: subject.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- subject.tmpl 21 Feb 2004 13:07:55 -0000 1.3 *************** *** 1,44 **** ! ! ! !

    Zalogowano jako: [Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! !
    ! !
    AUTHOR QtyRecieved
    AUTHOR QtyReceived
    ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Przedmiot
    >
     

    ! Trafienia od do z rekordów.
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Przedmiot
    ">
     

    ! Rekordy od do z znalezionych.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From kb2qzv at users.sourceforge.net Sat Feb 21 16:49:50 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 07:49:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl subject.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14054/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 subject.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- subject.tmpl 21 Feb 2004 15:49:48 -0000 1.2.2.1 *************** *** 1,44 **** ! ! ! !

    Zalogowano jako: [Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    ! ! !
    ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Przedmiot
    >
     

    ! Trafienia od do z rekordów.
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Przedmiot
    ">
     

    ! Rekordy od do z znalezionych.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From kb2qzv at users.sourceforge.net Sat Feb 21 16:50:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 07:50:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-userupdate.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14233/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-userupdate.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-userupdate.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-userupdate.tmpl 21 Feb 2004 15:50:54 -0000 1.3.2.1 *************** *** 1,56 **** ! ! !

    Zalogowano jako: [Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! Proszê nanie¶æ potrzebne zmiany. Biblioteka otrzyma wiadomo¶æ e-mailem.
    ! Zmiany te nie uka¿± siê dopóki biblioteka ich nie zatwierdzi..

    ! !
    !
    ! ! ! ! ! ! ! ! ! - - ! ! ! ! - - ! ! ! !
    Nazwisko
    Tytu³
    Imiê
    Ulica
    Miasto
    Tel. domowy
    Tel./Fax w pracy
    Email
    !
    !
    !
    !     ! ! \ No newline at end of file --- 1,47 ---- ! !

    Prosimy wprowadzić konieczne zmiany. Biblioteka otrzyma powiadomienie listem elektronicznym.
    ! Zmiany ukażą się dopiero po uwierzytelnieniu ich przez Bibliotekę.

    ! !
    ! ! ! ! ! ! ! ! ! ! ! + + ! ! ! ! + + + !
    Nazwisko " name="surname">
    Tytuł " name="title">
    ImiÄ™ " name="firstname">
    Adres " name="streetaddress">
    Miasto " name="city">
    Tel. domowy " name="phone">
    Tel/fax praca " name="faxnumber">
    Email " name="emailaddress">
    !
    ! ! From acli at users.sourceforge.net Sun Feb 22 06:18:55 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 21:18:55 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.16,1.17 tmpl_process3.pl,1.2,1.3 xgettext.pl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31961 Modified Files: TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Handle the iso8859-1 charset somewhat, so that when the po file is in either iso8859-1 or utf8, msgmerge(1) won't crap out. The code is ugly; the conversion table is hard-coded, and in some place not very appropriate. However, this does fix the case where a few strings containing French characters can't be translated. As a side effect, tmpl_process3 can now also be used for French or other languages using iso8859-1. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** TmplTokenizer.pm 20 Feb 2004 07:52:32 -0000 1.16 --- TmplTokenizer.pm 22 Feb 2004 05:18:52 -0000 1.17 *************** *** 540,544 **** } ! # Complication function that shouldn't be here sub parametrize ($@) { my($fmt, @params) = @_; --- 540,544 ---- } ! # Some functions that shouldn't be here... should be moved out some time sub parametrize ($@) { my($fmt, @params) = @_; *************** *** 573,576 **** --- 573,584 ---- } + sub charset_canon ($) { + my($charset) = @_; + $charset = uc($charset); + $charset = "$1-$2" if $charset =~ /^(ISO|UTF)(\d.*)/i; + $charset = 'Big5' if $charset eq 'BIG5'; # "Big5" must be in mixed case + return $charset; + } + ############################################################################### Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** tmpl_process3.pl 19 Feb 2004 21:28:14 -0000 1.2 --- tmpl_process3.pl 22 Feb 2004 05:18:52 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- use vars qw( $href ); use vars qw( $type ); # file extension (DOS form without the dot) to match + use vars qw( $charset_in $charset_out ); ############################################################################### *************** *** 99,103 **** } - # FIXME: Should we use the GNOME convention of using POTFILES.in instead? sub listfiles ($$) { my($dir, $type) = @_; --- 100,103 ---- *************** *** 147,150 **** --- 147,156 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; + # keep the buggy Locale::PO quiet if it says stupid things + $SIG{__WARN__} = sub { + my($s) = @_; + print STDERR $s unless $s =~ /^Strange line in [^:]+: #~/s + }; + my $action = shift or usage_error('You must specify an ACTION.'); usage_error('You must at least specify input and string list filenames.') *************** *** 180,192 **** } if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; ! system {'./xgettext.pl'} ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; --- 186,221 ---- } + # restores the string list from file + $href = Locale::PO->load_file_ashash($str_file); + + # guess the charsets. HTML::Templates defaults to iso-8859-1 + if (defined $href) { + $charset_out = TmplTokenizer::charset_canon $2 + if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/; + for my $msgid (keys %$href) { + if ($msgid =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/) { + my $candidate = TmplTokenizer::charset_canon $2; + die "Conflicting charsets in msgid: $charset_in vs $candidate\n" + if defined $charset_in && $charset_in ne $candidate; + $charset_in = $2; + } + } + } + if (!defined $charset_in) { + $charset_in = TmplTokenizer::charset_canon 'iso8859-1'; + warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n"; + } + if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); + # Generate the temporary file that acts as /POTFILES.in for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; ! # Generate the specified po file ($str_file) ! system ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; *************** *** 195,203 **** my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; ! system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2); system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; --- 224,239 ---- my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name + # Generate the temporary file that acts as /POTFILES.in for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; ! # Generate the temporary file that acts as /.pot ! system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2, ! (defined $charset_in? ('-I', $charset_in): ()), ! (defined $charset_out? ('-O', $charset_out): ())); ! # Merge the temporary "pot file" with the specified po file ($str_file) ! # FIXME: msgmerge(1) is a Unix dependency ! # FIXME: need to check the return value system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; *************** *** 222,228 **** close INPUT; - # restores the string list from file - $href = Locale::PO->load_file_ashash($str_file); - # creates the new tmpl file using the new translation for my $input (@in_files) { --- 258,261 ---- Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** xgettext.pl 19 Feb 2004 21:24:30 -0000 1.1 --- xgettext.pl 22 Feb 2004 05:18:52 -0000 1.2 *************** *** 13,19 **** use VerboseWarnings; use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); ! use vars qw( %text ); ############################################################################### --- 13,60 ---- use VerboseWarnings; + use vars qw( $convert_from ); use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); ! use vars qw( %text %translation ); ! use vars qw( $charset_in $charset_out ); ! ! ############################################################################### ! ! use vars qw( @latin1_utf8 ); ! @latin1_utf8 = ( ! "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", ! "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", ! "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", ! "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", ! "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", ! "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", ! "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", ! "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", ! "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", ! "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", ! "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", ! "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", ! "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", ! "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", ! "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", ! "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", ! "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", ! "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", ! "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", ! "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", ! "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", ! "\303\276", "\303\277" ); ! ! sub charset_convert ($) { ! my($s) = @_; ! if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now ! ; ! } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { ! $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; ! } elsif ($charset_in ne $charset_out) { ! VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; ! } ! return $s; ! } ############################################################################### *************** *** 88,91 **** --- 129,134 ---- sub generate_po_file () { # We don't emit the Plural-Forms header; it's meaningless for us + my $pot_charset = (defined $charset_out? $charset_out: 'CHARSET'); + $pot_charset = TmplTokenizer::charset_canon $pot_charset; print OUTPUT <\\n" "MIME-Version: 1.0\\n" ! "Content-Type: text/plain; charset=CHARSET\\n" "Content-Transfer-Encoding: 8bit\\n" --- 146,150 ---- "Language-Team: LANGUAGE \\n" "MIME-Version: 1.0\\n" ! "Content-Type: text/plain; charset=$pot_charset\\n" "Content-Transfer-Encoding: 8bit\\n" *************** *** 114,123 **** my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; ! printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( $t ); ! printf OUTPUT "msgstr \"\"\n\n"; } } --- 157,207 ---- my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; ! printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number ! if defined $pathname && defined $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( charset_convert $t ); ! printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? ! TmplTokenizer::quote_po( $translation{$t} ): "\"\""); ! } ! } ! ! ############################################################################### ! ! sub convert_translation_file () { ! open(INPUT, "<$convert_from") || die "$convert_from: $!\n"; ! VerboseWarnings::set_input_file_name $convert_from; ! while () { ! chomp; ! my($msgid, $msgstr) = split(/\t/); ! die "$convert_from: $.: Malformed tmpl_process input (no tab)\n" ! unless defined $msgstr; ! ! # Fixup some of the bad strings ! $msgid =~ s/^SELECTED>//; ! ! # Create dummy token ! my $token = TmplToken->new( $msgid, TmplTokenType::UNKNOWN, undef, undef ); ! remember( $token, $msgid ); ! $msgstr =~ s/^(?:LIMIT;|LIMITED;)//g; # unneeded for tmpl_process3 ! $translation{$msgid} = $msgstr unless $msgstr eq '*****'; ! ! if ($msgid =~ /\bcharset=(["']?)([^;\s"']+)\1/s) { ! my $candidate = TmplTokenizer::charset_canon $2; ! die "Conflicting charsets in msgid: $candidate vs $charset_in\n" ! if defined $charset_in && $charset_in ne $candidate; ! $charset_in = $candidate; ! } ! if ($msgstr =~ /\bcharset=(["']?)([^;\s"']+)\1/s) { ! my $candidate = TmplTokenizer::charset_canon $2; ! die "Conflicting charsets in msgid: $candidate vs $charset_out\n" ! if defined $charset_out && $charset_out ne $candidate; ! $charset_out = $candidate; ! } ! } ! if (!defined $charset_in) { ! $charset_in = $charset_out = TmplTokenizer::charset_canon 'iso8859-1'; ! warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n"; } } *************** *** 165,171 **** --- 249,259 ---- Getopt::Long::config qw( bundling no_auto_abbrev ); GetOptions( + 'charset=s' => sub { $charset_in = $charset_out = $_[1] }, # INTERNAL + 'convert-from=s' => \$convert_from, 'D|directory=s' => \$directory, 'f|files-from=s' => \$files_from, + 'I|input-charset=s' => \$charset_in, # INTERNAL 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, + 'O|output-charset=s' => \$charset_out, # INTERNAL 'output|o=s' => \$output, 's|sort-output' => sub { $sort = 's' }, *************** *** 177,183 **** VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') unless defined $files_from; $directory = '.' unless defined $directory; if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; --- 265,275 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') ! unless defined $files_from || defined $convert_from; $directory = '.' unless defined $directory; + usage_error('You cannot specify both --convert-from and --files-from') + if defined $convert_from && defined $files_from; + if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; *************** *** 186,198 **** } ! open(INPUT, "<$files_from") || die "$files_from: $!\n"; ! while () { ! chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); ! $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! text_extract( $h ); } - close INPUT; generate_po_file; --- 278,294 ---- } ! if (defined $files_from) { ! open(INPUT, "<$files_from") || die "$files_from: $!\n"; ! while () { ! chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); ! $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! text_extract( $h ); ! } ! close INPUT; ! } else { ! convert_translation_file; } generate_po_file; From acli at users.sourceforge.net Sun Feb 22 07:04:08 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 22:04:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_105.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6386 Modified Files: unimarc_field_105.tmpl Log Message: Some French letters were ? Index: unimarc_field_105.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** unimarc_field_105.tmpl 11 Feb 2004 09:01:41 -0000 1.2 --- unimarc_field_105.tmpl 22 Feb 2004 06:04:05 -0000 1.3 *************** *** 12,19 ****
    Code date publication --- 12,19 ----
    Code date publication *************** *** 21,29 ****
    Ann?e d?but ">
    Ann?e fin ">
    Année début ">
    Année fin ">
    /images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
    /images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
    CONFIRM DELETION of this entry and all entries depending from this one
    CONFIRM DELETION of this entry and all entries depending on this one
    ! ! ! ! ! ! --- 44,53 ----
    /images/background-mem.gif">Request/images/background-mem.gif">Item type/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! ! ! ! ! From acli at users.sourceforge.net Sun Feb 22 10:04:58 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 01:04:58 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.20,1.21 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2759 Modified Files: TmplTokenizer.pm Log Message: Try to relax the criteria for allowing groups of tokens without TMPL_VAR to be combined together into one string. This seems to have the desired effect (that "foo bar" type strings are now recognized in one piece). However, "

    foo

    \nexplanation"-type things may now also be (arguably wrongly) recognized as one piece. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** TmplTokenizer.pm 22 Feb 2004 08:18:27 -0000 1.20 --- TmplTokenizer.pm 22 Feb 2004 09:04:53 -0000 1.21 *************** *** 460,466 **** && $structure[$#structure]->string =~ /^<\//s) { my $has_other_tags_p = 0; - printf STDERR "last token %d is type %s: %s\n", $#structure, $structure[$#structure]->type->to_string, $structure[$#structure]->string; for (my $i = 0; $i < $#structure; $i += 1) { - printf STDERR "token %d is type %s: %s\n", $i, $structure[$i]->type->to_string, $structure[$i]->string; $has_other_tags_p = 1 if $structure[$i]->type == TmplTokenType::TAG; last if $has_other_tags_p; --- 460,464 ---- *************** *** 479,482 **** --- 477,504 ---- } + sub looks_plausibly_like_groupable_text_p (@) { + my @structure = @_; + # The text would look plausibly groupable if all open tags are also closed. + my @tags = (); + my $error_p = 0; + for (my $i = 0; $i <= $#structure; $i += 1) { + if ($structure[$i]->type == TmplTokenType::TAG) { + if ($structure[$i]->string =~ /^<([A-Z0-9]+)/i) { + push @tags, lc($1); + } elsif ($structure[$i]->string =~ /^<\/([A-Z0-9]+)/i) { + if (@tags && lc($1) eq $tags[$#tags]) { + pop @tags; + } else { + $error_p = 1; + } + } + } elsif ($structure[$i]->type != TmplTokenType::TEXT) { + $error_p = 1; + } + last if $error_p; + } + return !$error_p && !@tags; + } + sub next_token { my $this = shift; *************** *** 484,487 **** --- 506,512 ---- my $it; $this->{_queue} = [] unless defined $this->{_queue}; + + # Don't reparse anything in the queue. We can put a parametrized token + # there if we need to, however. if (@{$this->{_queue}}) { $it = pop @{$this->{_queue}}; *************** *** 533,537 **** $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p && $structure[0]->type == TmplTokenType::TEXT && $structure[$#structure]->type == TmplTokenType::TEXT) { # Combine the strings my $string = join('', map { $_->string } @structure); --- 558,564 ---- $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p ! && looks_plausibly_like_groupable_text_p( @structure ) ! && $structure[$#structure]->type == TmplTokenType::TEXT) { # Combine the strings my $string = join('', map { $_->string } @structure); From kb2qzv at users.sourceforge.net Sun Feb 22 18:06:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:06:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-search.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7734/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-search.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-search.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-search.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-search.tmpl 22 Feb 2004 17:06:55 -0000 1.3.2.1 *************** *** 1,92 **** ! ! !

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! !
    !
    !
    /images/background-mem.gif">Request/images/background-mem.gif">Item type/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! -
    S³owa kluczowe
    LUB :
    Przedmiot
    LUB jedno albo wiêcej z :
    Tytu³NormalnePrecyzyjne
    Autor
    Ilustrator
    Klasa ! !
    Kod kreskowy
    Zauwa¿, ¿e je¶li wpiszesz jak±¶ warto¶æ do S³owa kluczowe, oraz inn± gdzie indziej to u¿yta zostanie jedynie warto¶æ S³owa kluczowego
    ! ! ! --- 1,71 ---- ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SÅ‚owo-kluczowe
    LUB :
    Przedmiot
    LUB jedno albo kilka z :
    TytułZwykłeDokładne
    Autor
    Ilustrator
    Typ ! !
    Kod paskowy
    Gdy wprowadzisz wartość w Słowo-klucz oraz wartość gdzie inndziej, to jedynie Słowo-klucz będzie wzięte pod uwagę
    ! !
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:06:33 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:06:33 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-user.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7631/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-user.tmpl 3 Oct 2003 20:04:18 -0000 1.4 --- opac-user.tmpl 22 Feb 2004 17:06:30 -0000 1.4.2.1 *************** *** 1,131 **** ! ! ! ! ! ! !
    CZY NASZ REKORD JEST POPRAWNY?
    ! Karta dostêpu:

    ! ()
    ! ,
    ! (dom)
    ! (praca)
    ! !

    ! ! Czy którekolwiek z naszych danych s± niepoprawne? Czy ostatnio przeprowadza³e¶/a¶ siê, zmieni³e¶/a¶ numer telefonu lub adres e-mail?

    ! ! Zaktualizuj dane ! !

    ! ! ! ! Witaj ! [Wyloguj siê]

    ! ! ! ! ! !
    ! Masz niezap³acone nale¿no¶ci i kary w wysoko¶ci !
    ! !     ! ! ! ! !
    Masz niezap³acone nale¿no¶ci i kary w wysoko¶ci !
    !     ! ! ! ! !
    Posiadasz kredyt na !
    !     ! Przegl±daj konta ! ! ! ! ! ! ! ! ! !
    ! Czekaj± na Ciebie zarezerwowane pozycje: !

    odbiór w:
    !     ! !

    ! ! ! ! Obecnie masz wypo¿yczonych pozycji
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    tytu³AutorDo zwrotuTyp pozycjiOp³atyBie¿±cy Status
    TakNieTakNie
    - - Nie masz ¿adnej wypo¿yczonej pozycji. -     - -

    - - - - - Obecnie masz zarezerwowan±(ych) pozycjê(i).
    - - - - - - - - - - - - - - - - - - -
    Tytu³AutorData rezerwacji
    -     ! --- 1,135 ---- ! ! ! ! ! ! ! ! !
    CZY NASZE DANE SÄ„ POPRAWNE?
    Numer karty:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !
    Zmieniło się coś?

    ! Wprowadź zmiany !     !
    + + + + + +
    + Masz outstanding charges and fines z +
    + + + + + + + +
    + + Masz outstanding charges and fines z + +
    + + + + + + + +
    + + Masz a credit z + +
    + +

    Przejrzyj rachunki

    + + + + + + + + + /images/background-opac.gif"> + + + + + + + + + + +
    + + Masz reserved items waiting: + +
    TytułAutorDzień rezerwacjiPick Up Branch
    + ">  +

     

    + + + + + + +

    Masz wypożyczone pozycje.

    + + /images/background-opac.gif"> + + + + + + + + + + + + + + + + + +
    TytułAutorZwrot dniaTypOpłatyKredyt
    "> YesNoYesNo
    + +

    Nie masz żadnych wypożycznych pozycji.

    + + + + +

    Masz zarezerwowane pozycje.

    + + /images/background-opac.gif"> + + + + + + + + + + + +
    TytułAutorDzień rezerwacji
    "> 
    + ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:26 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:26 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-reserve.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7894/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-reserve.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-reserve.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-reserve.tmpl 22 Feb 2004 17:07:23 -0000 1.4.2.1 *************** *** 1,112 **** ! !
    ! !

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! ! ! !
    ! Przepraszamy, nie mo¿esz z³ozyæ zamówienia poniewa¿ zalegasz na . ! Przepraszamy, nie mo¿esz z³o¿yæ wiêcej jak rezerwacji. ! Z³o¿y³e¶/a¶ ju¿ zamówienie na tê pozycjê. ! Musisz wybraæ przynajmniej jeden typ pozycji! ! Musisz podaæ oddzia³ do odbioru! !

    !     ! !

    Strona rezerwacji dla pozycji: ( )

    !

    Z³o¿ono ju¿ zamówieñ na tê pozycjê.

    !

    Prosimy wybraæ, który typ pozycji Ciê interesuje. Pierwsza z pozycji, która stanie siê dostêpna a nale¿y do jednego z tych typów zostanie dla Ciebie zatrzymana. ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ZamówienieTyp PozycjiEgzemplarze
    Rezerwacja nie mo¿liwa
    !

    ! Prosimy wybraæ oddzia³, z którego chcesz odebraæ pozycjê: !

    ! ! ! ! !
    Rezerwacja tego dnia: ! ! ! !
    Koniec rezerwacji tego dnia: ! ! ! !
    !

    ! !

    !     ! !

    Prosimy potwierdziæ, ¿e chcesz zamówiæ pozycjê typu:

    !

    ! ! ! ! ! ! ! ! ! ! !
    Typ Pozycji
    ! która ma byæ podjêta .
    ! ! !
    Uwaga, bêdzie pobrana op³ata w wysoko¶ci PLN
    !     ! !
    !     --- 1,113 ---- ! !
    ! ! !
    ! Sorry, you cannot make reserves because you owe .
    ! Sorry, you cannot make more than reserves.
    ! Już posiadasz rezerwację na tę pozycję.
    ! You must select at least one item type!
    ! You must select a branch for pickup!
    !
    ! ! !

    Strona rezerwacji dla pozycji: ( )

    !

    Istnieje rezerwacji na tÄ™ pozycjÄ™.

    !

    Prosimy wybrać żądany typ pozycji. Pierwszy z typów, który stanie się dostępny zostanie dla Ciebie zarezerwowany.

    ! !
    ! ! "> ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ZamówTyp pozycjiCopies
    ">Cannot be Reserved

    ! Prosimy wybrać oddział, z którego nastąpi odbiór pozycji: ! !

    ! ! ! ! !
    Rezerwacja tego dnia: ! ! ! !
    Rezygnacja tego dnia: ! ! ! !
    !

    !
    ! ! !

    Prosimy o potwierdzenie rezerwacji:

    !
    ! ! "> ! "> ! ! ! ! ! ! !
    /images/background-opac.gif">Typ pozycji
    ">
    ! której odbiór nastąpi z .
    ! "> ! !

    Uwaga, pobrana zostanie opłata w wysokości $

    ! ! !
    ! ! !
    + \ No newline at end of file From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:40 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-moredetail.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7970/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-moredetail.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-moredetail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-moredetail.tmpl 22 Feb 2004 17:07:37 -0000 1.4.2.1 *************** *** 1,53 **** !
    - -

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj]

    - -

    Zaloguj siê do Koha

    -     -
    ! ! ! ! &type=intra> ! ()

    ! > ! > --- 1,47 ---- !

    ! ! ! ! &type=intra> ! ()

    ! > ! >

    GROUP -
    ! !
    ! Biblionumber:
    ! Typ Pozycji:
    ! URL:
    ! Czas wypo¿yczenia:
    ! Op³ata za wypo¿yczenie:
    ! Klasyfikacja:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilustr:
    ! Rozmiar:
    ! Notki:
    ! Liczba pozycji:
    *************** *** 55,99 ****
    GROUP -
    ! !
    ! Biblionumber:
    ! Typ pozycji:
    ! URL:
    ! Loan Length:
    ! Rental Charge:
    ! Classification:
    ! ISBN:
    ! Publisher:
    ! Place:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Size:
    ! Notes:
    ! No. z Items:
    !     !
    BARCODE !
    ! > ! > ! > ! !
    ! Home Branch:
    ! Ostatnio zdano:
    ! Ostatnio po¿yczono:
    ! issue bit ! Ostatni czytelnik 1:
    ! Ostatni czytelnik 2:
    ! Bie¿±cy oddzia³:
    ! Cena wymiany:
    ! Pozycja zagubiona:
    ! Paid for:
    ! Notki:
    ! Przed³u¿enia:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Anulowano:
    &bi=&itm=>Total ! Issues:
    ! Group Number:
    ! Biblio number:
    --- 49,93 ----
    ! !
    BARCODE !
    ! > ! > ! > ! !
    ! Home Branch:
    ! Last seen:
    ! Last borrowed:
    ! on issue bit ! Last Borrower 1:
    ! Last Borrower 2:
    ! Current Branch:
    ! Replacement Price:
    ! Item lost:
    ! Paid for:
    ! Notes:
    ! Renewals:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Cancelled:
    &bi=&itm=>Total ! Issues:
    ! Group Number:
    ! Biblio number:
    *************** *** 104,108 ****
    !

    --- 98,102 ----

    !

    *************** *** 110,112 **** ! --- 104,106 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:54 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-main.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8003/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-main.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-main.tmpl 3 Oct 2003 20:04:18 -0000 1.4 --- opac-main.tmpl 22 Feb 2004 17:07:51 -0000 1.4.2.1 *************** *** 1,135 **** ! ! Katalog Publiczny systemu KOHA ! ! ! ! ! ! !

    ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Szukaj w Katalogu
       
    ! !
    ! ! Wype³nij pole i naci¶nij klawisz ENTER.
    ! ! ! -Wyszukiwanie zaawansowane (wiêcej opcji).
    ! ! !

    ! !

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj]

    ! !

    Zaloguj siê do Koha

    ! !
    ! !
    !

    !

    --- 1,128 ---- ! ! ! ! ! WELCOME TO THE KOHA OPAC + + ! ! ! !
    /images/front-background-med.gif"> ! /images/holder.gif" alt="" width="1" height="440" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/holder.gif" alt="" width="260" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="30" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="350" height="88" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" alt="" width="1" height="30" hspace="0" vspace="0" border="0"> ! ! !        /images/front-arrow.gif" alt="" border="0" width="27" height="22"> ! ! ! Szukaj w katalogu ! !
    ! !
    ! Wpisz słowo i naciśnij Enter.
    ! ! /images/front-arrow-small.gif" alt="-" width="20" height="16" hspace="0" vspace="0" border="0" align="middle"> ! Szukanie zaawansowane, więcej opcji ! !
    !
      !        /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! ! ! Nowe nabytki !
    !
    ! nabyte w ciÄ…gu ostatnich dni ! !
    !
      ! /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! ! !

    Zalogowano jako: [Twoje Konto][Wyloguj]

    ! !

    Zaloguj do Koha

    ! !
    ! ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:11 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-searchresults.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7831/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-searchresults.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-searchresults.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-searchresults.tmpl 22 Feb 2004 17:07:09 -0000 1.2.2.1 *************** *** 1,126 **** ! -
    - -

    Zalogowano jako: [Strony cz³onkowskie][Wyloguj siê]

    - -

    Zaloguj siê do Koha

    -     - - - - Szuka³e¶ - - Nie poda³e¶/a¶ ¿adnych kryteriów wyszukiwania
    -     - - - znalezione trafienia -

    - - - - - &=>/images/numbers/prev.gif border=0> - - /images/numbers/placeholder.gif border=0> - - - - /images/numbers/-highlight.gif> - - &=>/images/numbers/.gif border=0> - - - - &=>/images/numbers/next.gif border=0> - - /images/numbers/placeholder.gif border=0> - - -

    - - - - - - - - - - /images/background-opac.gif> - - - - - - - /images/background-opac.gif> -
    Przedmiot
    >
    -  
    - - - - - - - /images/background-opac.gif> - - - - - - - - - - - - - - - - - - - - - /images/background-opac.gif> -
    Tytu³Autor©Ilo¶æ PozycjiLokalizacja 
    >> - >Zamówienie - - Nierezerwowalne - -
    - - /images/background-opac.gif> -
    - - &=>Rekordy poprzednie - -   - - - - - - &=>Rekordy nastêpne - -   - -
    -
    -     - -
    - Trafienia od do z rekordów. -

    - - - - Przepraszamy, nie znaleziono ¿adnych trafieñ
    - - Spróbuj kolejnej kwerendy - --- 1,132 ---- ! +
    + Szukano + + + nabyte w ciÄ…gu ostatnich dni
    + + You did not specify any search criteria
    + + + + znalezionych pozycji
    +
    + + +
    + + &=">/images/numbers/prev.gif" border="0" alt="Previous Page" height="14" width="15"> + + /images/numbers/placeholder.gif" height="14" width="15" alt="" border="0"> + + + + /images/numbers/-highlight.gif" alt="" height="14" width="15" border="0"> + + &=">/images/numbers/.gif" border="0" alt="" height="14" width="15"> + + + + &=">/images/numbers/next.gif" border="0" height="14" width="15" alt="Next Page"> + + /images/numbers/placeholder.gif" border="0" width="14" height="14" alt=""> +
    +
    + + + + + + + + + + /images/background-opac.gif"> + + + + + + + + /images/background-opac.gif"> + + +
    Przedmiot
    ">
    +   +
    + + + + + + + /images/background-opac.gif"> + + + + + + + + + + + + + + + + + + + + + + + /images/background-opac.gif"> + + +
    TytuÅ‚Autor©Liczba pozycjiLokalizacja 
    bgcolor="#ffffcc">">bgcolor="#ffffcc">">bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> + + ">Zamów + + Not Reservable + +
    + + /images/background-opac.gif"> + + + +
    + + &=">Previous Records + +   + + + + &=">Next Records + +   + +
    +
    + + +
    +
    Rekordy od do z znalezionych.
    +
    + + + +
    Nic nie znaleziono
    + + +
    Spróbuj innej kwerendy
    + From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:06 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-detail.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8060/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-detail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-detail.tmpl 22 Feb 2004 17:08:04 -0000 1.4.2.1 *************** *** 1,84 **** ! ! !

    Zalogowany jako: [Strony Cz³onkowskie][Wyloguj siê]

    ! !

    Zaloguj siê do Koha

    !     ! !

    >Zamów

    !     ! ! ! () !

    ! ! !
    ! OPIS BIBLIO !
    ! ! Podtytu³: ! Autor: >
    ! Autor dodatkowy:
     ! Wydano przez : ! w ! , ! ,
    ! Collection:
    ! Has³o przedmiotowe:
    ! Rok :
    ! Uwagi:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL:
    ! ca³kowita liczba pozycji:
    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
    Witryna OnlineDostêpna
    !

    !

    !
    !

    ! --- 1,75 ---- ! ! !

    ">Zamów

    ! ! !

    !

    !

    ! !
    ! ( record )
    ! ! ISBN:">
    ! Subtitle:
    ! Autor: ">
    ! Additional Autor:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Przedmiot:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number z Items:
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Typ pozycjiLokalizacjaDate DueLast SeenKod paskowy
    Website OnlineAvailable 
    !

    !


    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:21 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-auth.tmpl,1.5,1.5.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8113/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-auth.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** opac-auth.tmpl 3 Oct 2003 20:04:18 -0000 1.5 --- opac-auth.tmpl 22 Feb 2004 17:08:19 -0000 1.5.2.1 *************** *** 1,49 **** ! ! !

    Przepraszamy, system KOHA uwa¿a, ¿e nie masz uprawnieñ do tej strony.

    ! ! !

    Przepraszamy, twoja sesja wygas³a, prosimy zalogowaæ siê ponownie.

    ! ! !

    Twój dostêp dokonuje siê z innego adresu IP! Prosimy zalogowaæ siê ponownie.

    ! ! !

    Wprowadzi³e¶ niepoprawne has³o lub nazwê, prosimy spróbowaæ ponownie.

    ! ! -
    !
    ! ! ! ! ! -
    ! ! ! ! ! !
    Koha - Wstêp
    NumerKarty:
    Has³o:
    -     		- - -
    ! --- 1,40 ---- ! ! !

    Sorry, KOHA doesnt think you have permission for this page.

    ! ! !

    Sorry, your session has timed out, please login again.

    ! ! !

    You are accessing koha from a different ip address! please login again.

    ! ! !

    Zł hasło lub użytkownik/numer karty. Spróbuj raz jeszcze.

    ! ! !
    " method="post"> ! ! " value=""> ! ! ! ! ! !

    Wejście do Systemu

    Numer Karty:
    Hasło:
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:35 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-account.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8176/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-account.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-account.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-account.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-account.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-account.tmpl 22 Feb 2004 17:08:32 -0000 1.2.2.1 *************** *** 1,39 **** ! ! ! Konto dla ! [ Pocz±tek][Wyloguj]

    ! !

    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    KARY I OP£ATYKWOTADO ZAP£ATY
    !
    W sumie
    !

     

    ! \ No newline at end of file --- 1,37 ---- ! ! !

    Rachunek dla

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-opac.gif" colspan="2">KARY & OPÅATY/images/background-opac.gif" colspan="1">KWOTA/images/background-opac.gif" colspan="1">POZOSTAÅO
    !
    Do zapłaty
    !

     

    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:47 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl kohaerror.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8240/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 kohaerror.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: kohaerror.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/kohaerror.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** kohaerror.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- kohaerror.tmpl 22 Feb 2004 17:08:44 -0000 1.2.2.1 *************** *** 1,17 **** ! ! !
    !
    ! ! !
    Wyst±pi³ b³±d
    -
    - ! --- 1,13 ---- ! !
    ! ! !
    An error has occurred
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:01 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes opac-top.inc,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8318/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 opac-top.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-top.inc,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-top.inc 1 Oct 2003 15:14:31 -0000 1.3 --- opac-top.inc 22 Feb 2004 17:08:59 -0000 1.3.2.1 *************** *** 1,70 **** ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! - - - - - - - - - - - - - - - - - - - - - - - - - ! !
    KOHA: Przeszukiwanie KataloguSearch - - Zapisy - - Pocz±tek
    KOHA
    - -
    - --- 1,48 ---- ! ! KOHA: OPAC Catalogue Search ! ! /includes/opac.css"> ! ! + + + + + + + + +
    + /images/front-background-small.gif" height="50" border="0" alt="">KOHA + + + Search + + + + Join + + + Home + +   +
    + + + + +

    Zalogowano jako: [Twoje Konto][Wyloguj]

    + +

    Zaloguj to Koha

    + From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:22 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes opac-bottom.inc,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8403/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 opac-bottom.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-bottom.inc,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-bottom.inc 1 Oct 2003 15:14:31 -0000 1.2 --- opac-bottom.inc 22 Feb 2004 17:09:19 -0000 1.2.2.1 *************** *** 1,32 ****
    - -

     

    -
    -
    ! ! ! ! Przeszukiwanie Katalogu || ! ! ! ! Pocz±tek ! ! -
    - - - --- 1,14 ----

     


    ! Catalogue Search || ! Home
    From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:35 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes cat-class-list.inc,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8512/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 cat-class-list.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: cat-class-list.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/cat-class-list.inc,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** cat-class-list.inc 6 Jan 2003 02:06:06 -0000 1.1 --- cat-class-list.inc 22 Feb 2004 17:09:33 -0000 1.1.2.1 *************** *** 1,4 **** --- 1,4 ---- From acli at users.sourceforge.net Sun Feb 22 22:34:44 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 13:34:44 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplToken.pm,1.3,1.4 TmplTokenizer.pm,1.21,1.22 tmpl_process3.pl,1.4,1.5 xgettext.pl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv471 Modified Files: TmplToken.pm TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Preliminary support for "analysis" of strings with tags. Early termination of analysis if we encounter some strings, such as

    or | or ||, in order to avoid extracting strings that are unnecessarily long and which doesn't add any meaningful context. Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TmplToken.pm 19 Feb 2004 21:24:30 -0000 1.3 --- TmplToken.pm 22 Feb 2004 21:34:40 -0000 1.4 *************** *** 89,92 **** --- 89,98 ---- # only meaningful for TEXT_PARAMETRIZED tokens + sub anchors { + my $this = shift; + return map { $_->type == TmplTokenType::TAG && $_->string =~ /^{'_kids'}}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens sub form { my $this = shift; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** TmplTokenizer.pm 22 Feb 2004 09:04:53 -0000 1.21 --- TmplTokenizer.pm 22 Feb 2004 21:34:40 -0000 1.22 *************** *** 421,431 **** } ! sub _token_groupable_p ($) { # groupable into a TEXT_PARAMETRIZED token my($t) = @_; ! return $t->type == TmplTokenType::TEXT || ($t->type == TmplTokenType::DIRECTIVE && $t->string =~ /^(?:$re_tmpl_var)$/os) || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<\/?(?:b|em|h[123456]|i|u)\b/is || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) --- 421,442 ---- } ! sub _token_groupable1_p ($) { # as first token, groupable into TEXT_PARAMETRIZED my($t) = @_; ! return ($t->type == TmplTokenType::TEXT && $t->string !~ /^[,\.:\|\s]+$/s) || ($t->type == TmplTokenType::DIRECTIVE && $t->string =~ /^(?:$re_tmpl_var)$/os) || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<(?:b|em|h[123456]|i|u)\b/is ! || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) ! } ! ! sub _token_groupable2_p ($) { # as other token, groupable into TEXT_PARAMETRIZED ! my($t) = @_; ! return ($t->type == TmplTokenType::TEXT && ($t->string =~ /^\s*$/s || $t->string !~ /^[\|\s]+$/s)) ! || ($t->type == TmplTokenType::DIRECTIVE ! && $t->string =~ /^(?:$re_tmpl_var)$/os) ! || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<\/?(?:a|b|em|h[123456]|i|u)\b/is || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) *************** *** 440,444 **** sub _formalize ($) { my($t) = @_; ! return $t->type == TmplTokenType::DIRECTIVE? '%s': _quote_cformat($t->string); } --- 451,458 ---- sub _formalize ($) { my($t) = @_; ! return $t->type == TmplTokenType::DIRECTIVE? '%s': ! $t->type == TmplTokenType::TAG? ! ($t->string =~ /^': _quote_cformat($t->string)): ! _quote_cformat($t->string); } *************** *** 453,456 **** --- 467,471 ---- } }; + &$undo_trailing_blanks; # FIXME: If the last token is a close tag but there are no tags # FIXME: before it, drop the close tag back into the queue. This *************** *** 515,558 **** if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? ! !blank_p( $it->string ): _token_groupable_p( $it ))) { my @structure = ( $it ); ! my($n_trailing_spaces, $next) = (0, undef); ! my($nonblank_text_p, $parametrized_p, $next) = (0, 0); if ($it->type == TmplTokenType::TEXT) { $nonblank_text_p = 1 if !blank_p( $it->string ); } elsif ($it->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; } ! for (my $i = 1, $n_trailing_spaces = 0;; $i += 1) { $next = $this->_next_token_intermediate($h); push @structure, $next; # for consistency (with initialization) ! last unless defined $next && _token_groupable_p( $next ); if ($next->type == TmplTokenType::TEXT) { ! if (blank_p( $next->string )) { ! $n_trailing_spaces += 1; ! } else { ! ($n_trailing_spaces, $nonblank_text_p) = (0, 1); ! } } elsif ($next->type == TmplTokenType::DIRECTIVE) { - $n_trailing_spaces = 0; $parametrized_p = 1; ! } else { ! $n_trailing_spaces = 0; } } # Undo the last token push @{$this->{_queue}}, pop @structure; ! # Undo trailing blank tokens ! for (my $i = 0; $i < $n_trailing_spaces; $i += 1) { ! push @{$this->{_queue}}, pop @structure; ! } @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do ; ! } elsif ($nonblank_text_p && $parametrized_p) { # Create the corresponding c-format string my $string = join('', map { $_->string } @structure); my $form = join('', map { _formalize $_ } @structure); $it = TmplToken->new($string, TmplTokenType::TEXT_PARAMETRIZED, $it->line_number, $it->pathname); $it->set_form( $form ); --- 530,583 ---- if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? ! !blank_p( $it->string ): _token_groupable1_p( $it ))) { my @structure = ( $it ); ! my @tags = (); ! my $next = undef; ! my($nonblank_text_p, $parametrized_p, $with_anchor_p) = (0, 0, 0); if ($it->type == TmplTokenType::TEXT) { $nonblank_text_p = 1 if !blank_p( $it->string ); } elsif ($it->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; + } elsif ($it->type == TmplTokenType::TAG && $it->string =~ /^<([A-Z0-9]+)/is) { + push @tags, lc($1); + $with_anchor_p = 1 if lc($1) eq 'a'; } ! # We hate | and || in msgid strings, so we try to avoid them ! for (my $i = 1, my $quit_p = 0, my $quit_next_p = ($it->type == TmplTokenType::TEXT && $it->string =~ /^\|+$/s);; $i += 1) { $next = $this->_next_token_intermediate($h); push @structure, $next; # for consistency (with initialization) ! last unless defined $next && _token_groupable2_p( $next ); ! last if $quit_next_p; if ($next->type == TmplTokenType::TEXT) { ! $nonblank_text_p = 1 if !blank_p( $next->string ); ! $quit_p = 1 if $next->string =~ /^\|+$/s; # We hate | and || } elsif ($next->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; ! } elsif ($next->type == TmplTokenType::TAG) { ! if ($next->string =~ /^<([A-Z0-9]+)/is) { ! push @tags, lc($1); ! $with_anchor_p = 1 if lc($1) eq 'a'; ! } elsif ($next->string =~ /^<\/([A-Z0-9]+)/is) { ! my $close = lc($1); ! $quit_p = 1 unless @tags && $close eq $tags[$#tags]; ! $quit_next_p = 1 if $close =~ /^h\d$/; ! pop @tags; ! } } + last if $quit_p; } # Undo the last token push @{$this->{_queue}}, pop @structure; ! # Simply it a bit more @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do ; ! } elsif ($nonblank_text_p && ($parametrized_p || $with_anchor_p)) { # Create the corresponding c-format string my $string = join('', map { $_->string } @structure); my $form = join('', map { _formalize $_ } @structure); + my $a_counter = 0; + $form =~ s// $a_counter += 1, "" /egs; $it = TmplToken->new($string, TmplTokenType::TEXT_PARAMETRIZED, $it->line_number, $it->pathname); $it->set_form( $form ); *************** *** 605,612 **** # Some functions that shouldn't be here... should be moved out some time ! sub parametrize ($@) { ! my($fmt, @params) = @_; my $it = ''; ! for (my $n = 0; length $fmt;) { if ($fmt =~ /^[^%]+/) { $fmt = $'; --- 630,637 ---- # Some functions that shouldn't be here... should be moved out some time ! sub parametrize ($$$) { ! my($fmt_0, $params, $anchors) = @_; my $it = ''; ! for (my $n = 0, my $fmt = $fmt_0; length $fmt;) { if ($fmt =~ /^[^%]+/) { $fmt = $'; *************** *** 620,624 **** $fmt = $'; if (!defined $width && !defined $prec) { ! $it .= $params[$i] } elsif (defined $width && defined $prec && !$width && !$prec) { ; --- 645,649 ---- $fmt = $'; if (!defined $width && !defined $prec) { ! $it .= $params->[$i] } elsif (defined $width && defined $prec && !$width && !$prec) { ; *************** *** 634,637 **** --- 659,678 ---- } } + for (my $n = 0, my $fmt = $it, $it = ''; length $fmt;) { + if ($fmt =~ /^(?:(?!).)+/is) { + $fmt = $'; + $it .= $&; + } elsif ($fmt =~ /^/is) { + $n += 1; + my $i = $1; + $fmt = $'; + my $anchor = $anchors->[$i - 1]; + warn_normal "$&: Anchor $1 not found for msgid \"$fmt_0\"", undef #FIXME + unless defined $anchor; + $it .= $anchor->string; + } else { + die "Completely confused decoding anchors: $fmt\n";#XXX + } + } return $it; } Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** tmpl_process3.pl 22 Feb 2004 08:18:27 -0000 1.4 --- tmpl_process3.pl 22 Feb 2004 21:34:40 -0000 1.5 *************** *** 89,96 **** } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); ! print $output TmplTokenizer::parametrize($fmt, map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? ! text_replace_tag($t, $attr): $t } $s->parameters); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); --- 89,96 ---- } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); ! print $output TmplTokenizer::parametrize($fmt, [ map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? ! text_replace_tag($t, $attr): $t } $s->parameters ], [ $s->anchors ]); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); *************** *** 298,302 **** This is an experimental version of the tmpl_process.pl script, ! using standard gettext-style PO files. Currently, the create, update, and install actions have all been --- 298,303 ---- This is an experimental version of the tmpl_process.pl script, ! using standard gettext-style PO files. Note that the behaviour ! of this script should still be considered unstable. Currently, the create, update, and install actions have all been *************** *** 316,321 **** The --help option has not been implemented yet. ! There are probably some real bugs too, since this has not been ! tested very much. xgettext.pl must be present in the current directory; the --- 317,328 ---- The --help option has not been implemented yet. ! If an extracted string contain actual text (versus tags or ! TMPL_VAR directives), the strings are extracted verbatim, ! resulting in unwieldy things like multiple spaces, tabs, ! and/or newlines which are semantically indistinguishable ! from single blanks. If the template writer changes the ! spacing just a little bit, the new formatting would be ! considered new strings. This is arguably wrong, and in any ! case counter-productive. xgettext.pl must be present in the current directory; the *************** *** 332,335 **** --- 339,345 ---- (e.g., to get rid of the "Strange line" warning for #~). + There are probably some other bugs too, since this has not been + tested very much. + =head1 SEE ALSO Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** xgettext.pl 22 Feb 2004 06:46:17 -0000 1.3 --- xgettext.pl 22 Feb 2004 21:34:40 -0000 1.4 *************** *** 22,37 **** ############################################################################### ! sub negligible_p ($) { my($t) = @_; # a string # Don't emit pure whitespace, pure numbers, pure punctuation, # single letters, or TMPL_VAR's. # Punctuation should arguably be translated. But without context ! # they are untranslatable. return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\.,:;'"%\(\)\[\]\|]+$/ # pure punctuation w/o context || $t =~ /^[A-Za-z]$/ # single letters ! ); } --- 22,51 ---- ############################################################################### ! sub string_negligible_p ($) { my($t) = @_; # a string # Don't emit pure whitespace, pure numbers, pure punctuation, # single letters, or TMPL_VAR's. # Punctuation should arguably be translated. But without context ! # they are untranslatable. Note that $t is a string, not a token object. return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\+\.,:;!\?'"%\(\)\[\]\|]+$/ # punctuation w/o context || $t =~ /^[A-Za-z]$/ # single letters ! ) ! } ! ! sub token_negligible_p( $ ) { ! my($x) = @_; ! my $t = $x->type; ! return !$extract_all_p && ( ! $t == TmplTokenType::TEXT? string_negligible_p( $x->string ): ! $t == TmplTokenType::DIRECTIVE? 1: ! $t == TmplTokenType::TEXT_PARAMETRIZED ! && join( '', map { my $t = $_->type; ! $t == TmplTokenType::DIRECTIVE? ! '1': $t == TmplTokenType::TAG? ! '': token_negligible_p( $_ )? ! '': '1' } @{$x->children} ) eq '' ); } *************** *** 40,45 **** sub remember ($$) { my($token, $string) = @_; ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; } --- 54,62 ---- sub remember ($$) { my($token, $string) = @_; ! # If we determine that the string is negligible, don't bother to remember ! unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; ! } } *************** *** 70,77 **** my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { - #$t = TmplTokenizer::trim $t; remember( $s, $t ) if $t =~ /\S/s; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { - #$t = TmplTokenizer::trim $t; remember( $s, $s->form ) if $s->form =~ /\S/s; } elsif ($kind eq TmplTokenType::TAG && %$attr) { --- 87,92 ---- *************** *** 97,101 **** # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t unless negligible_p($t); } } --- 112,116 ---- # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t # unless negligible_p($t); } } *************** *** 128,132 **** my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { --- 143,147 ---- my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! #next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { *************** *** 317,331 **** =back ! Right now it does about the same thing as text-extract2.pl but ! generates gettext-style output; however, because it is scanner- ! instead of parser-based, it is able to address the 4 weaknesses ! listed in translator_doc.txt. Ultimately, the goal is to make ! this able to do some kind of simple analysis on the input to ! produce gettext-style output with c-format strings, in order to ! facilitate translation to languages with a different word order ! than English. ! When the above is finished, the generated po file may contain ! some HTML tags in addition to %s strings. If you want to generate GNOME-style POTFILES.in files, such --- 332,340 ---- =back ! Note that this script is experimental and should still be ! considered unstable. ! Please refer to the explanation in tmpl_process3 for further ! details. If you want to generate GNOME-style POTFILES.in files, such From kb2qzv at users.sourceforge.net Sun Feb 22 23:01:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:01:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images/numbers - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images/numbers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7786/koha-tmpl/opac-tmpl/default/pl/images/numbers Log Message: Directory /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images/numbers added to the repository --> Using per-directory sticky tag `rel_2_0' From kb2qzv at users.sourceforge.net Sun Feb 22 23:38:51 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:38:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images background-mem.gif,NONE,1.1.2.1 background-opac.gif,NONE,1.1.2.1 clear-button.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15592/images Added Files: Tag: rel_2_0 background-mem.gif background-opac.gif clear-button.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a£ ¬@1 d' ®zÍξ“°}¥·ï÷Ç‚Á´éž4ƒ„ Uxj Žt”••Wd•dXv–•giŸŽ¨Xz ‡…€4‡µ·‰~ J¼½¾¿À½96®¸Ç€4†µÏÐÑÒÓÔÕÖ×ØÙÚÛÔÇ· 4hPK DÍD@@x›Y ÐQ möÈ·<à3QöÒÚq?®†N-oô¤ÒM`ÕqÔaQÀÿî5Ÿó±òQIáWÈ!¸IT‚[t\H´”Åï­áUO Ø ª²ÀD>caRK-Â@@¤ '„†@'qBÀ@¼UÒ€Ô ôãA D–’ @™#DõÊ:I¡‹®uéå—À4!&FØcæ™h¦©æšˆÊL&çœtÖiç‡PN ˆƒçŸ€*hdÌì §8ÌPÌ¢Œ6êè£F*餔Vj饘Bª%à§"ä“騤–jê£ÄœZi+›nš€,ìÓÎmžÕjë­¸VsËŒ¶a˜Èi­+ì°Äkì±È&[l11%£h4ÌVŒ<à8åÿµØf«í¶íA_lŽbÄèÕjˆ’€¢†´ˆGEèyU»î&çí0Z&À+†L™I,@ÀW¿9X/;±Ç…qð¹ÛV³µì»Ñ"¹9¥ƒVÂâÁ\) ^w%Ìñð- †ÂSX›€,&^—ÇZDXßlYæKËmìSÆݹì€f`ááLënÁ' Ì0ÐAKjúž\t+ïװϦ(îÚ^t½·†ÓW p³ÜJ·(tlÞm4 at H£‚SÕ  KëPe7{e)7vÛÌRU"s­}øæ€×YDóS×¥Ó¦x4à±ÁWX¹Ô«WÖÖœ;"î¢äÞx*›°—óÒ¥³40%z¡ö‚L€"‹P#x7ìœ_þí¦ÎC»¶s+Ð 8Á uš½õàc{oªážÜ¯Ó*«þúì·ï>±ÌE¡3¡ÉÊ­¸æ¯ÿþx]—ª p9Yy ÈÀ:°ZBÒ›h3¨ Zð‚‚"@edÀÁzðƒ a B From kb2qzv at users.sourceforge.net Sun Feb 22 23:39:29 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:39:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images front-arrow.gif,NONE,1.1.2.1 front-arrow-small.gif,NONE,1.1.2.1 front-background-med.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15728/images Added Files: Tag: rel_2_0 front-arrow.gif front-arrow-small.gif front-background-med.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a €ª=l Aœr¤?†h„†– ·¹Ë&! --- NEW FILE --- GIF89a   QU1‘’.…‡.„†X-XY.[*x|j4i<;2•–M%LO*O@B=B33HJJO*{| #$2–—-†‡ ,„$jm2“” (tv ]_h3h-„†)(g3hn7nk7k"dfP$M&nq! %gj^.]Z2Z ^5^j5j ?A/‹Œ  --- NEW FILE --- GIF89a ¸Äÿ sÏïûÿ€‚ƒ„…†‡$Rw i‘’“”•–—g wzˆ ¡¢£¤¥¦§¨†ŠŒS ˜²³´µ¶” T©¿ÀÁÂÃÄÅÆ,»S ·ÏÐÑÒϺVŸÇÙÚÛÜÝÞÛPV¯Óäåæç² V¾ßîïðñòó0ÉV ±èúûüýgÊ(´£G° ÁƒÿD`!¿‡#ò0¡Å‹3j$AÁŠ1CŠY.Àº)Ø6ÿª\ɲå¨E­ I³¦Íh &£o · s«í§GK°ÀÏ ³? óÌ5ÓL°²Ùj«²Ã@;,‡Pq’¬KX­7mÜ–QN2&š;€Œ4 Ž|dàÓ»ÈUÏ}ZUˆ7·Ñä„0ùKá$ƒ" ä`"ϸ3ȹ.m“ccöŋ €LyYO‚ìÈÉ'½ñ êG? Ò¡ô+Ÿd#äR×ú€ˆo\“©˜U#€Ð!UX`€ÍÂ4°úobjÊJY"5ˆl [—êÖÅ l«xUÀ¼0±hà^op€© ÊÕ,œô‡ÐŠÂ°0¡þõ´ª`‰zW<Ó|ˆ]«c+>Ú¶u|¶m¬Ít»XÝîö¶¸ nb%H3NŒ ¬jQËÜæŠ@µ ëD{-l1}ÿüìp·FŒ– zèh! Ô­ÔÍ2Jó|øýg 96„iÊTä­æ`Þó¢w½NpÚ+Ôèø½tˆïq'Lá [ØÂäÅCrl`óGÁ qq$à„x}¬ +ë$š»Î» î|,|$ÓT“„ÍøÔ~Ùó|28ŸŠÅ“¸Ãª|}V—çÌ¥V‚Ъ‘qšÜÐUczúâ6!dTgÅÈ¿lŽà|@tgM8ùÒ,Ü{¬½$-œÄœŠ$x~¹L¢ÜLi¤8SYÊhXH{7ý-ÿŒÐ…; žóÓ¬1àkKw:W³Òöx‚­£ÔryN ÎS,}™Ê 1ŸÒÎñÅZ­=2Æb¢&VÃõH‘jÉƧì˘Ñi­Ö§|‡“7ÎF4)  »¹uýÌ­Í`R~ìx,ö\:<;²c‚Í8‚tÑõe;ßÙG÷X{L1 yE+••Z)U5õ*eÁŸa‰¬¨ß1b5dUà5 ¿ðÇÈVÓ”:…Ñ&ŸU]Éû_ø4Qú¼`öÁŸ#œ‰§Žë¡y3G.û9$ïD±u¡¿û›ð¢ˆŸý*Ô›„%ÊÛÜ|Š¸/ßM0—£ÿ æ] 0Ę(Œ™%<œPL8UZ^bfjnrvz~‚†vFIMU©h¥‚­Žµž¹ÁƺABŠ¥È)$ _pûi´Ôg;§.>ýúö­1…ÂœJrܸQóSpiðÕJû¬çÿ_Y H/µÖÒ-|…üN¶Ô $kñÖg£í˜§0’@ÈbÃMs㬶Ýw+Õt / ·ßSÛLwÎx^¸7]çÃÀ 8‹(²BÀ‡@\bŽ:¨€Å1ŠGœ«¨#¶5àƒRÜ"Ä`ðY1ŒÒÿÛXÈÅ3Lw% ~2•®*€"YÊWrŽ%X ähU²ÒœZ¥§ ÝëGÉ&VÀòò® Ø)a=jÔÃ"6°VXlcy:Ì•B5²z¼«*KT‚S³ƒT¬^=‹R/’P´˜”àÞfÚŠ2ð§ªÕ£"ûÚÂB㯳µbm]{[†–ºÝ-¹ ÐßÆ4¬º$n%jVäu çv~xΕ òÚb2ë9kH6cŸÕ,=šr".t@·[åDÿ/MVp€’OŸÒ<;³¥ñ©Íéio„o§Û©_î†ÚÌÊq©¯™çT£mÔ­nç§áçcXï̹ž50/ûh\§LÒ% 5¯]mb`oÍÀÅÆ&A‘½5®. ÒËf¦£­5,«xÚ¶4Yj­­´ÿZÛ·ôµ·—fÞl‹û“¯.w®Wn` @¿fw½¸Ê€Ò¾û“¦÷¦¡î|#’ âŠnô¢¿›ÿ˺®„úï°= GŸú ``ý –¹Ÿ pcìÍÞ?âÿ‘à@ ¡A&äIzÆBjAú@8äCJâ8Äã,ŽÓŒF΋²U 7j](~# ˆdî߇B~Bå^,âÇHÂ$LÇ ÐÒLc3)ÿNæä-ndÀÝ@Z’2)¡PŠ£)åg äQ¢b2¤P>¥¤3ÚOÑ$µÅÁraå¸èä/P^Ov¡ý@ `Š!9b†TFw$æZª#¶á[¾e²<UÒâš5æ%¢8à ì£Ýuá¡@ Šæ`bAŽÄa"fZêE2¶%;Bæ[ª $iÇ!§Y"#('cdƒ:(„Be|À|úêe(¹dã짇ƒ"äFpöàHež&Š¦è‘Ž¡‰㈺g\J¨ èT…¢‘aáå† ÛüümáGrR;&ápgèx"iŠd1†cÂh$f"ÌeÖh=Z)ub Wþå:§ –%S–!™–d™"©Ÿ®"{®©3NâÑè]朒 ’ÙiÑÀWÃ>&Y¢)’i‹’㟠꠪çz>è¡ž ý8 ëSëªk ]æE¢k¡l(WniÑè)¦nŸ‰&¢avª½Žé)–ÇA’G``슦£®6%+ŽêkHûMJ$fì¡ÏÐ9+Àã#âj j½ jy\lU$„xŒ‡Î2b[¶$ºgTî"/‘£lʦ‰bqè–^PëâhÅúÿêTÇx„‡o\­xTÅ9¦£*®§—Šì$ÒÁÀ**í•*Ó«æËöUh:lš&·ªhrªÃÝòlÞÈÞbíbb«#2©ÈJY™íÿ8Úm¦mnª«ŽÀå1lâȬÜ'Ý&§fXÅåžÞî,p€Gdžà—þ«$Ž, @áÎC%.Žú›Žò¨Ĭ8ÞkÝ~GJnllíàmg`®UøíæǦi{ºãè*jev­jê† ¤*¬¬¢^E-©p¤¦yÞîÖÚîÞ&Döf¯×.Dk‚,d/ >F’û€tÍRÜ¢áü¦dýþFæòîóUøí®†mè fm pe¢_!p½0o0ðçÛF®Ü£yž¤ånnÈ ó¯9bíŠmø ¯+>ã°Í(ÛΩÙg ‡ ”µ/ÎÕ­‚ ÕJ… ï¯ÞÊ0çb0yhnÖ.g¨~¬H>dD–@ -ß‚ ©C#õ Ÿ²ÌJA£™êïN5ðε—stÖ¡”†±F3f7Ýd!ÀÛ®£Q³pæÅöÅL4Âu8`ƒJ2kO²c0#H6eÚaG e¯—mëŒ,e‘ üÉhfx9Ä®ìÚo ß8à à}¨¦Æ’6$Ÿ®ˆö_^|Ÿ]G¸OÓ¸½pÕ2\ÁnÇ/¿NïÇBiGöùÄÊ’x~÷+;úó´b8­8¿wéáuê¼\È]¹¹ù(#ä¸@)""¨s„% ^Þ}æ zš×ô\Oki˜JùÐ!ÂíLa IxžGÚ]ÅPÐî·˜öxõþ7ÿZè^¢Ë^»ŠÀí¥9 ®“tÇÝí É$oïx÷ö¦òö~tÀ{¼ÛÅ“éÑ|Öͼ®Ï]Îs|ÇKÝð€h<‰<á@¹¿.JǨ£¤DïìSÕài;á‰ÿÖͼÎSý®óü¥wqÐ?Û ^…ú!#ýöDßxx±ÄOüÍSýÕw|À}ÖÏ%}s½Ò@Á×iµÖìo»4`È8 :ØÉ<Îç¼Û_ºÇÛÎvÍxÝ){Þ³°‘ªt"—}‡«ÁVú྿>ÜËvêpË 4ãßÍDœ aöwy–ºXÜ8 TâØM}Û_½çÇ=÷ À¬œËV“>ÃéÇ\ÎÉßëjóëSÕìþ¿W»@'ü|ïSŽéŸ~À#Yï½J#{ëûÅßçí+¿ü\ ÿÔÿöùÛ=HbDF †6 öó:ò‰!j%0¦–‰8ÐZ`‘ÍHÂÂWHº£ägPž‰fšjŽ&e‡-‚xew[Îiœ ^¾ðe z"ç¡‹e6·f ‚JèJm戤•>”Iet¶(€Í๧žŒm–œ„yñSh§ž~ j0‡"Z% vf‰eAúà£:Pâ̤•fv)¦a,Çœ™¡îÊk¯¾òW $èø&%®¶ÚÓ*òtì±°Æg˜—¶Þx«°þŠm¶Ún»Æ¨P9¦:Û5›jw Øì«wÊú•‡&…k®ºrKo½özŠZ2×¹û^¦ž:£é¢ŠI€Î†¸›»¶J(¬¼÷> qăæÛ°^à"!Y€uy%wÛµúB»üR«@¼ò*qÊ*¯ìd¾ýäµïÈ÷;Ùo6ó&™Ì3ç\rÅ.£ÌrÐBáÏ0“0µÎÌtÓLçìŽÉ'ÃHtÕV_¥ÑmU,,^SPrظSò×ñê;u¾X¯ÍvÛøÝæË(Í-÷ËpÿìvÞzï]áÝ~ãÍwà‚ From kb2qzv at users.sourceforge.net Sun Feb 22 23:40:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:40:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images heading-login.gif,NONE,1.1.2.1 heading-member.gif,NONE,1.1.2.1 heading-search.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15862/images Added Files: Tag: rel_2_0 heading-login.gif heading-member.gif heading-search.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a& X‹wp¯<ß2j,¦D†vP|aŽ„ˆì\`µ¡¥Ë—0cÊœI³¦Í›8sêÜɳ§ÏÿŸ5ñÒ΀"ÚÌ9YtÉ€ ¢JJµªÕ«X³jÝʵ«×¯`ÊÛu…³^òÑòàÀ’$KÊ1b [SXbCݲX—  (¼£$" °DuZé^R‰Üj„ðÁ§IÕA]~p^t`&–£¥ ÄÚª§·–êÒ®½eì±ÇþÅ®§*%©tuñf•h¹eP‡T¢aà l<)³S5“mùå˜sU¯r÷eцÎJ:Ý”]!&ïT¦‡Øu«×zæˆ͹Xà;ÿ¿qø› V[tX°ÈH¬ä)NYW€ÄáP4ƒÿ"¼Ð€=Ôa Xà€´ !*Ex—®ï*³ta ð²«XîЖ™"`E ˜¨¨m± ÌžE»°)0©qÎ u‰ £rÞzåh&¦É„ÉÕ¼&¶fHBØlœÖ\Âpê0 ,rÊ2a$#ÊÉ°Qˆ gH«Z×ÊÖ¶ºõ­pÕB SPƒÊWÎò–»üå0ym‚ --- NEW FILE --- GIF89aK& dÏïûÿ€‚ƒ„…†‡ˆ‰Š‹ŒŽ{bQt—˜˜x…#|QQ|¦Qª¥¦©{#°#¦³¤¬¨ ¬Q‚Ã|#T# |È¿¦Á´Í¬Æ»¬®´Ÿ¬ŸÑ·R³žµ}«ž£ãÔµ·¹Û¸åQæØâÀö ­‘øtá+“AM¦º jçg•±azžå ¢’½d¸éYÆÿ> H– A%¢ EÊÔc²)Ò5Ó) ÑdÀ>_,ØáÅ@ÂA n¹)wµ¬Ù³hÓª]ËÖP.°jÀ@W9eeàÍÁ¿€ L¸°áÈ+^Ìø҂Ǻò ”¦ÀÍléI…ÿŒ*k“Î1ÙQ«€š«#˜¹É˜žL@¬›L€g³vH?¶Ö>ð ¤­ÙÙ¯ ¬™¶ÚBëcQtŠNF¡c¬µa ÿÜ0˜~ëäc». at AA®­è>¦n+Û.³€ºÙæ®±ÙöZm-×\á«FÖê« äû¯Áá–[ñæBÆo½þJ¼/¹}&rÅ”ÌÑh˜ÿH‘\ˆÿI±¨¢ÛuˆßˆvÈ sS¼ÜâjDà•~r<Ç*ø(‡~8m—óËíÉÌx)ßµÐ8ëLãnD³g Ë:Çú fxÄ+‚ ! ”È6>s™ÉüŒWVÑœh®§˜^Ë2îòM`ÞÒkŠŒCÒ®ÓNs2m䥡ÆÉcB3˜Û‘B&ƒ£ 6Ë8”Ö ;°ˆù `ˆ@£Ê.pÑKcÃÒ˜±êajbÀÙƒÆ"p¯ƒ‘tWõ×>3©Vm‚Zÿ #˜ºRúÑ9´S¹Z©Lv°+1Çaµ)¸.ÐR[Ñt¨cÊž(aÍĜ犄° FŒñ=WHõ#} bG„¸ª¢r¬(Åâ0Ær4àŠÐðêV‡²”qCv4ìHÜFœìA%Xõªê°ºÖÀÉ•Jݸj$ºB¤ª1«º‡«ÖR’6€¨M:+p|¶ žË>SÄ(£&>I‚"ˆ‰aÆRm€èÈ&´Ð¶=0ns«[j$—þìa4¾ƒP‚ø‚0ûX'1lPi#^¤Ó@ð¦)P£!Õ„3Eôyƒàî©Nÿèò,Ý‚# (h@Ô±@hâÂØ@Òvv”Ìzp øð-9YWáúÉ Z ò’ËÞšßÜ(Nl¹ÁÀØÄ€($ 7 "}•ä “M Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15993/images Added Files: Tag: rel_2_0 holder.gif inside-koha-bottom.gif inside-top-join.gif inside-top-member.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a --- NEW FILE --- GIF89aE ¥Ç¤çƒ$¾°8ü-›? ¨Z@ a¬ðÊpñ‚Çø<Ùü­dÕH ! p†B !fx uv|e€S‡žpœwc akŒ!…Ÿ´µC !º»¼½±³¶Â†‚ O~ή€ÕIRŸRHŒ• z{ß ÐÖJrµ u¤áò•™€rÃC°Žê 8`‡ p0Ç€“†ûj1p‚8yáÊ@¢8¥@ÄZýÜ™IRI ‚Å ¡É€ *˜Ç'š½’J€ ÏÓ¶ÿ$~*ÍWá!Î"jýÄPæÐqŒÄ‚§-ªèØÁˆ±’kT í+ ×1ßUËeAÝG !,4-“Ç‘æZ’¤ ±«èœB7O.K²j³ g`Cr9ˆ¡åË ”-Û¼¬†ËÄuü؃ºþ™:Û êA©JËžM›Ö Ÿ€PR˜4% T$!@Ñoý°…€fáQ`ø4@Ø‚ C €³ 7à8 ({óЋŒ4 Ô\ÖŒÃÑP" --- NEW FILE --- GIF89aa2 ö{ÐLâÄŠ$úiÈPeÊ„ M DÉšM@Ò* YÀ³ç‚ÿ 1bcÔ`(€F5h ¨(¢L½hÐâhÔE/dLðɵg#º.0¡ð‰°>5hö€k‰² €ë!»u{’EtV¬OÈ@~áwA®ž)Mø<Ìs¯Ù¹<ï.ÎK—}¹:¹ráÏ C‹KIÚNŸ¬B˜Åº5k 1<ŒžM»¶íÛ¸sëÞÍ»·oÄ’LëN¼¸ñãÈ“+§b!† (¸f„Ây„åسkßΈíaÆM¿Ó«_Ͼ½û÷¿ÿœJ"zP9E Œ?!ƒ< ‰¨Á>ô¤à†aa!RØ"ebhd†Q`Ø…<­Ø`‹/FâˆrCdŠ‘‚€-à“B8P$|êù1Ÿ…a Ã}‹ †U!"6‡ÄÁ!l€š û°6À„q]¶è¦«ÿî¼e «ÙªÈ aXðë½øæ«/¾òÁº‡'îzp•¼°Pn$7%¬ð 7ìð&9 ÇDmåž ‚€Š  À`-8ád0¬œàñ`Š66ò%Fd¥Ÿe¥]OòIXˆ1Êb!†¼H*Y at upf-¥'èNO—ò²¨Žh;õ©@j6¢R«Z„°B(Ô C U ¥4¿G‘“ N€Ú †Q†*Ê#7ƒ¹'ŒæJ‡Ì(ç5Gz4¶E`»€å芗ö —ÿÙ\ÄLz¡VÝœçIO!ädm¡"èÄ¥*Y=¡`k OùÊ[þò --- NEW FILE --- GIF89aa2 N!“ì“' ®|N¯Ûïøü’Äïûÿ€4 åG U’“!f̘ЈÓC/ž"j™È)¢Å`ð …4˜p\z‘ èškßν»w"¹YÍ0W½<"´ù^Ͼ½û÷ðãËo­Ï©$´KØZdÀ@yý怂z²åÄT ¬€@ 9uöÎ1L0 p¶6gg‡¬ö§gL-èÚ;¶&Xž ÚÙYŸrÆ(k1Šä¥óV )¦ÑhÔ(ª,cʀ驨¦ªêªµ窦;iÆäw´Öjë­¸æÊ„P hNÜÕjN\q …±Ö2:7€hgwãX÷j»ùwWŒ¶ƒÅ¯áô7F!Öù¸ßvŒ;HùÆœ¿¶©}ðñu)ƒ¨ÀH=g(ò¥•ãÔ³ ¬O"öôž)áÎÞBÀ3….Ü>ÁŽ@KŽ ˆ' .¶‡M¬ïÒ×Xë]V±œý2+<ÍO˜ J€ˆ From kb2qzv at users.sourceforge.net Sun Feb 22 23:41:27 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:41:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images inside-top-search.gif,NONE,1.1.2.1 koha.gif,NONE,1.1.2.1 menu-home.gif,NONE,1.1.2.1 menu-join.gif,NONE,1.1.2.1 menu-login.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16122/images Added Files: Tag: rel_2_0 inside-top-search.gif koha.gif menu-home.gif menu-join.gif menu-login.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a]2 k°¯ÆǃL~*ìœÌ"ˆœsvbhÊ6áF‰ØÎòè Ò%m·Æ€K+۷榫ÿn·Ô•âÞ»ðÆ+ï¼ô6‚P ï¾dðõ,ðÀomØð@ ¢ÉBÀ „‘^ÁWlñr– ºe«È aø×ìÈ$—lòÉ(§aÑòçžp@ˆ[7r@Ä‘\£óÎ<÷ìóÏ>gsJSF<ñ Ô\6Ô 2‚'؃V„6.˜¬ÊqžÐ0"Db}àÕ^‡ ËÝÜéî™l`C©)]Þ À}p‰0L¢B ˆØÄ*ÒÐ…7Ìa‰HÂ-z ‡$ £ÇHÆ2¢‚hC ~pÅ 9#Òbµï@'ˆ©-¯'¬\+b×í-îFEÉ&­¯Ø§*•,ôk ­rÙ €—£Läâ 4 ê·À‘L8õµ¬îUûš~³þ}ésãÏÕ¸téS€ð€Ûù³€ú'\eejþøÇ?Q%Œ¶?¨ ‚ð§µ3Æ4¹P{˜€ ¸€“Ð@“Åq~pW50s-(  À€¸ØÖ@BuW4òa¹UÚµ6ù—‚*¸‚ BTîôNG --- NEW FILE --- GIF89aÈ pMVAyˆÆðTRYÏä1L'dËeÒÚ@ÿS|"ʲœ§†@¡½$ÑÉ:þYÑcÊÔ… ¯¼“†„ªÕ’_¼f¸ ½I øÍEt¤u‰\@I ML†UÈ)í” “=s½ªËïH ‘ 'î$¦vUDà=åæ%ÖÀ•ÈØv¤Ù› ¾d§¼OËwñ)¸úªšl¿¦DcŠèO…HS`œ '%Ø'=´ø‡HzU˜kF8¦Ïûý´ÿK2ñICk½5ᘉHÜÔÐzˆÀ¦ÅRñ€G#$×Tþ¥"mOœu ¦8„…Ý<_^ª`H³‘Ö…ˆ¨Â5¨2Jô8d‘1ôŒLâbäQ&ÙD‚8iD>ñ%Ò˜'`bùx©i„ü­‰ÉŽL0·Á6,&ÑÌ[“•f›«yᚌÚárg|B“0Ø$l^²©qZÚR“Træ™rãÄh§Î¤ŽPÍjD©‡X™D§‘pÖ"q¶ᘢGàšBˆH$—‚®V,™‚8}ðéL†!¼ÞÉDªæ01²G0§§NØ……¬UDÿlÎRE¶–61Ú¸·ÓD»àQîk]Ј+ùLšEµŸ¸©„³ï—L¬hÙd.1±ïºTH¸¬ ÑȪE»€Þû d"B±÷¹„ÅîŽAÀ­ÁT$Çl!§ÀD”-5r°F0÷å^›Å\'ø5rŸ žj©23Ü~¤ß'êI«S<7ÌQhˆõÉß½§½\à¼rZG2-§ŸÐKÄNà\õçÅ _ᯨ‡6ûIäK´k¸ ›ÝåÛý} Ç&kañæ«^·K³þ+«ã4m;.áÿÏU8ö@Ù˜;±oíJL^¥8÷^s_ ±ïàC¸&4˜ QóÓKøͼÆþŒ„ðž'a,ðFàü¼¡&ï›' • äcwÝ>;ÿ¸¡¼•+© !×îÑH.Er£ƒ†¾'ø" 8»^¢„!õGB+T»“\MgÑ«žÐ8ãM!TCY "EüG.O,®^°S™ !…$&fó+‚ßÀ÷;pŠNð™ê¸Ç¿U ¦@VÐ9zA∻* Âf‘­ÿÈYJ‚ÝQ°Þp:ÇCáHI !ß¾FØ ¥!TyÎJ°)‡‘ÐS{I…áp¾Ð¨ÂW7Ñp¦„Î]ŒV¦ ˆ˜0ˆ“ APd«ß\´½ ~.Ìq“!àØYAC'G‡ &!þ9pxúDV‚E¬C|âf OÜ'WSaÓ’FžÝ¤r”—`¡ †xÊÌyb|‹ò„ƒòñ4‹qOU&ù%DO¸Rlû…à¥7gQïHNd£:u¯%¸æ‰ØFS¢¨ Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16289/images Added Files: Tag: rel_2_0 menu-mysettings.gif menu-search.gif mouseover-home.gif mouseover-join.gif mouseover-member.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89aZ gg $nt"y+Z&€z? ¡¢Ÿl"ns~q›\Z¬ ­€ |\¼p§’aZwV)££#¨€b’Ä#­´µ–axx]×ysÝtoUÊ€º)УÕnÂŽ,<˜r‰: ¨0Ÿ@èTÐäæ˵¤'¡¬"䕨+íP­ò‡Àa‰)€àdkHSD×X‰ ¢yo,0C‘!ÀÈP.˜T×­N® œ¦ Õtf—‡³(úãióg-š.‰Š<* Éa7ûXÚIBÕ\€ZcS¢Ö?ï|dàCˆ((€:Ú@€I7ªízcB „˜¼±¤+[Ä_wy˜ƒ'Ëde*dÀ—O --- NEW FILE --- GIF89aG Rz`¨ÀPI,'VVDCAÍÂ7èÞR# "/ Öb0è@§©\IP%á‡d9äð ŽTƒ#Bƒè 0—ƒje0Ù¦› --- NEW FILE --- GIF89a,0 -,‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š™- +‚''}|~av‚+†,E=B?B=C 1´B:2102²»D½¿1µCò¯?==3ÈË22ÓÏÑÔÖ²ËÍB¯ÓáÌÚDÝäصÅÀå±BÕëÁæ?Öæßä³µËü×ÐÒY69ÔâS QcJ9é¦N¨@ƒXµH±¢Å‹3j$‚¨ ¨PužPؤOÈ“Sª\ɲ¥Ë—0cÊœI³¦Í›8sêÜÉs$‰ÿ@ƒ J´¨Ñ#})Mq`…S§ (˜JµªÕ«X³jÝʵ+×N^ÊK¶¬Ù³h·.xʶ-I&I—2uZ‘j0bÈ€µDÀ"~“2x™ÃMþQœ±xîœ8Ž|´²Žžœt éÛ% ǤŠxÈòE :¨°7µjÖ¦cË&ha˜ÏJú¸TúTjÚßÀƒ N¼¸ñ°k*u‰;É \,˜8I½ºõëسkßν»¨îàËO¾¼ùó€XŽÊãâ„ì÷ðãËŸßÄô>øóëßÏ¿¿ÿÿ ‘¨Læ©Ã:j4…2)ç5y9YKœlòˆ„/²$£¡¡Ê¥ ¡¤^À* ÄŠg,ðÀN =äÈ+-Eÿ—Dç®ûî¼÷î{$ÿ÷èqÉÕ!8r­üòaöTÉOãÂüéo5ØóÕ— Ø;LÀþøI¡K” úW„ÿñ¯{8`8È üMã~ÄÐr@^ñ*5°` 3˜š ¯3Ò#©JW›Ejtbmþb©LgZ“­‡*±ÝFÇÓžúô§@uDðæ?ù½ÍuHMªR—ºÔ ýÁCÍô"¤ÏYõªXͪVCBU;HOL «XÇJÖ¦Jï)«Z×ÊÖ¶âÍk£KÓÙæJ׺Úõ®H{M÷ÊW --- NEW FILE --- GIF89a,0 5u¬µ¶-e— W Bž.\>U^` d¦$˯³¯´ÓÒÖ ©ÙåÛìê¨ÚÔïÝËÞ ØD´ !‚ JÃ\Ð-’ýI¦XQ„?W¢ ÂË7" !‡6­»áêÚ–‹g†þ¯7×™GÞ0yÓV1}U"ŠT²Y$ºio±^UÔ Äoou}Ùòë§x¯×]¼TDx)ð  ˆÑ H c]ØÎ…a¹Â¡ˆíˆu†î¤Q£†ºòb‹a䢌0b…bí怑1zán —ÀL¦2—ÉÌf:ó™ÐŒ¦4§IÍjZóšØ̦6¡©•I­ŠÔ•8ÇIÎršóœ>¹SͦÈÿý¯Z£Ø¦<çIÏzÚóžøÌg3S©Òù± €„ AˆÊA‰€ ¨€€AÄÿ£Šh(0*Qˆ‚Ô¢(ýOwÖôÊ€þE™b¸¶2f9n½î:Ö“ŸàG½áÅàCžñʾÊlOxÿZžû²Gõ…Ï|#PUñöEø]o|уžO{7=æQc>-*r>¾ùýô¦ÝCLôÎúºáIõ_NÅVšÁdÅ¥KMV79h¨õg²IU'2.iœ#DÜøˆÙDUÁ&–"B3¬9Þp=F6‰-È2+ÛX†¼9l3›Èç°1ƒ,FØ(„#Yj3+ZËT£g/»DþV¼v!ræ1Aê06äh#²´ùMeªÓ@à478UÎq¤A¶ù&nÿE,Žå:›ÀØ($¹¶™nutÛè(º‘ÙVtš»Üä€wcòx¡v#Cà˜÷éè®áœ¸‹^H±W9;(Ϩjš†¹îºò’Ä0»Þ„)Á"SkjôàÊ@ÍÁ@Ú7\7 õƒI¦Ò‚Av6Ë„©¼ãµŽ„¯ó0+xcÉy°?¬a ÿFÆ– e²d?Ž¥2#(ã>‘ÌÁ$Ô.@,&û#$­Í`ŒN^rT¸£&+â5':ca¤Ìå.GòÇÍú‚Pð SyË®£Î Ä« 㩠ΙˆJ€„LÄO8 N܃‚3!¿ùÖQŠçÁßûBx;œqñ„\€_Û×n6 ¶CåW£Ñº\^ðÆü¤) zXðäVúv31¨>q™éÀmrtu¸æÓ£T,}›¸ºÖíÉOýAîèHg :g¥%¥”&Ä»Q --- NEW FILE --- GIF89a,0 g 59á2âåæäæé.Ì ÑBX\ÖEZdh"èÐA tð@Â@/: ¢àÓG1p(ˆ9 ¨‚Š%˜h_ˆ=Y•;…„*ð`el6Û?’dkn ¹ÚF&©$i:£ Ñ‱3±7 ò,DË‚³•ÿ´~„ŽCÖ-± TW-?Û’eì@AÍí¹èiÕ­¸Æ²›Þ,¼Wí±â~nuX1‹^¾¤{¸ÄúD¯½þ>+‚¼OÝë¢ f¡×ZlíÚÂ¥¹  ~ý/߀Ÿzþ0‰¶ïYïyÃö?°A~õ³ OHÀpÑï ”HB¨ ÊA9lè`uR²µúñxäÛàIÈBòˆL¤"IÈ;ò‘Œ¤$'II@  L0( 0&%q̤4P#A2àx¨À„k­ ”Ï:€7l%i?o·ÈÂ2h†KÀ UÑ From kb2qzv at users.sourceforge.net Sun Feb 22 23:42:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:42:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images mouseover-search.gif,NONE,1.1.2.1 search-button.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16393/images Added Files: Tag: rel_2_0 mouseover-search.gif search-button.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a,0 XB^]_AV 9óó4X0úôýþÿ24X€à †;ð0 |áµÙD×[#§ÀHðà)nH ꨨÆj©¶ŠÛ»•zª§0 Ž`€ 6) yñàC_À+ì°Äkì±È&«ì²Ì6ëì³ÐF«Ù_XhAÀÿ ¨ì*qµp«a»žP£(xA”£Qæ’Ò`ž-Åh<J˜5Òd$hŠi¡Ëc$WM½„” àZ †«ˆãÙ/]°ª'Å Õºn¸]d'AšM¨´£¸ÅB(ïÐè¦_A½9mjƒÊS”F7 =©ÞÔð=T]*üâ3øÆO~ñŸ*SæKµ›U³pÿP‘ZÿúÕ(ö·Ïýî{?¤}¹*;\+ ˜J¬fiø€¸-! --- NEW FILE --- GIF89a£ † ‘¥¨¶¯©$¸ ›"  ˆ†4ÌÍXLÕÖ×ØÙÕ 9ÐÍà óòl-Ìp2'Âë œéÓ¨S«^ͺµë×°cÇÞWZ ÂæhèÞÍ»·ïßÀƒ N¼¸ñãÈi0biq²£KŸN½zuÚÏ Õ@ De‚ $ Ò$ FÒ ±ökeœ‘+Ù;f¡cµÎ¾}÷³åEù·¤JZ{€ýl®¿~µìí§0c%ïCˆù y!•ŽTñ€ý·™0s¹ ‹3½P‡#P¢*4(‚”¡‰"°Ü©Ø ò0f£Ú°¶¶Ä¤œá@âW¿8ƒ¤BÖéNE²`급HàOQŽê˜C¬)uÄÊf~·°5¯j§˜‚ E’°Àk$I From acli at users.sourceforge.net Mon Feb 23 02:21:06 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 17:21:06 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.22,1.23 tmpl_process3.pl,1.5,1.6 xgettext.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13082 Modified Files: TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Fold all consecutive whitespaces into single blanks. This avoids problems when minor whitespace changes occur in the original templates; it also makes the strings much easier to read (e.g., instead of "foo\n\n\t\t bar", xgettext.pl will now always generate "foo bar" and tmpl_process3.pl will understand it to be the same as the original string). Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** TmplTokenizer.pm 22 Feb 2004 21:34:40 -0000 1.22 --- TmplTokenizer.pm 23 Feb 2004 01:21:03 -0000 1.23 *************** *** 449,455 **** --- 449,471 ---- } + sub string_canon ($) { + my($s) = @_; + if (1) { # FIXME + # Fold all whitespace into single blanks + $s =~ s/\s+/ /gs; + } + return $s; + } + + sub _formalize_string_cformat ($) { + my($s) = @_; + return _quote_cformat string_canon $s; + } + sub _formalize ($) { my($t) = @_; return $t->type == TmplTokenType::DIRECTIVE? '%s': + $t->type == TmplTokenType::TEXT? + _formalize_string_cformat($t->string): $t->type == TmplTokenType::TAG? ($t->string =~ /^': _quote_cformat($t->string)): *************** *** 599,602 **** --- 615,622 ---- } } + if (defined $it && $it->type == TmplTokenType::TEXT) { + my $form = string_canon $it->string; + $it->set_form( $form ); + } return $it; } Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** tmpl_process3.pl 22 Feb 2004 21:34:40 -0000 1.5 --- tmpl_process3.pl 23 Feb 2004 01:21:03 -0000 1.6 *************** *** 33,38 **** sub find_translation ($) { my($s) = @_; ! my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; ! $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); return defined $href->{$key} && !$href->{$key}->fuzzy --- 33,44 ---- sub find_translation ($) { my($s) = @_; ! my $key = $s; ! if ($s =~ /\S/s) { ! print STDERR "DEBUG: before: ($key)\n"; ! $key = TmplTokenizer::string_canon($key); ! $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); ! $key = TmplTokenizer::quote_po($key); ! print STDERR "DEBUG: after: ($key)\n"; ! } return defined $href->{$key} && !$href->{$key}->fuzzy *************** *** 313,329 **** file as c-format strings with %s. =head1 BUGS The --help option has not been implemented yet. - If an extracted string contain actual text (versus tags or - TMPL_VAR directives), the strings are extracted verbatim, - resulting in unwieldy things like multiple spaces, tabs, - and/or newlines which are semantically indistinguishable - from single blanks. If the template writer changes the - spacing just a little bit, the new formatting would be - considered new strings. This is arguably wrong, and in any - case counter-productive. - xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. --- 319,331 ---- file as c-format strings with %s. + Whitespace in extracted strings are folded to single blanks, in + order to prevent new strings from appearing when minor changes in + the original templates occur, and to prevent overly difficult to + read strings in the PO file. + =head1 BUGS The --help option has not been implemented yet. xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** xgettext.pl 22 Feb 2004 21:34:40 -0000 1.4 --- xgettext.pl 23 Feb 2004 01:21:03 -0000 1.5 *************** *** 56,61 **** # If we determine that the string is negligible, don't bother to remember unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; } } --- 56,62 ---- # If we determine that the string is negligible, don't bother to remember unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! my $key = TmplTokenizer::string_canon( $string ); ! $text{$key} = [] unless defined $text{$key}; ! push @{$text{$key}}, $token; } } *************** *** 154,157 **** --- 155,159 ---- printf OUTPUT "#, c-format\n" if $cformat_p; printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po + TmplTokenizer::string_canon TmplTokenizer::charset_convert $t, $charset_in, $charset_out; printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? From acli at users.sourceforge.net Mon Feb 23 04:13:38 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:13:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport marcimportdetail.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31496 Modified Files: marcimportdetail.tmpl Log Message: "maxlenght" should be "maxlength" Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** marcimportdetail.tmpl 11 Feb 2004 09:02:56 -0000 1.4 --- marcimportdetail.tmpl 23 Feb 2004 03:13:35 -0000 1.5 *************** *** 12,39 ****
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Title" size=40 maxlenght=255>
    Subtitle" size=40 maxlenght=255>
    Author" size=40 maxlenght=255>
    Additional authors
    Illustrator" size=40 maxlenght=255>
    Copyright" size=20 maxlenght=80>
    Series Title" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Number" size=40 maxlenght=255>
    Volume Date" size=40 maxlenght=255>
    Volume Description" size=40 maxlenght=255>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    LCCN" size=40 maxlenght=40>
    Dewey" size=8 maxlenght=10>
    Subclass" size=40 maxlenght=40>
    Publication Year" size=5 maxlenght=10>
    Publisher" size=40 maxlenght=255>
    Place" size=40 maxlenght=255>
    Pages" size=5 maxlenght=10>
    Size" size=40 maxlenght=40>
    --- 12,39 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Title" size=40 maxlength=255>
    Subtitle" size=40 maxlength=255>
    Author" size=40 maxlength=255>
    Additional authors
    Illustrator" size=40 maxlength=255>
    Copyright" size=20 maxlength=80>
    Series Title" size=40 maxlength=255>
    Volume" size=40 maxlength=255>
    Number" size=40 maxlength=255>
    Volume Date" size=40 maxlength=255>
    Volume Description" size=40 maxlength=255>
    Subject" size=40 maxlength=255>
    Notes" size=40 maxlength=255>
    Item type
    ISBN" size=40 maxlength=40>
    ISSN" size=40 maxlength=40>
    LCCN" size=40 maxlength=40>
    Dewey" size=8 maxlength=10>
    Subclass" size=40 maxlength=40>
    Publication Year" size=5 maxlength=10>
    Publisher" size=40 maxlength=255>
    Place" size=40 maxlength=255>
    Pages" size=5 maxlength=10>
    Size" size=40 maxlength=40>
    From acli at users.sourceforge.net Mon Feb 23 04:15:04 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:15:04 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31759 Modified Files: intranet.zh_TW Log Message: Interim update Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** intranet.zh_TW 22 Feb 2004 06:46:16 -0000 1.5 --- intranet.zh_TW 23 Feb 2004 03:15:01 -0000 1.6 *************** *** 4,8 **** # Copyright 2004 Ambrose Li # ! # FIXME words tentatively translated: active, illustration, illustrator, inactive # FIXME "request", "reserve" should be é ç´„ [http://www.tpml.edu.tw/chinese/service/service.htm] # --- 4,9 ---- # Copyright 2004 Ambrose Li # ! # FIXME words tentatively translated: active, illustration, illustrator, inactive, order, receive, seen ! # FIXME tentative: bookfund: 書ç±è³¼ç½®è³‡é‡‘ [...4274 lines suppressed...] msgid "traducteur" --- 6881,6884 ---- *************** *** 7096,7110 **** msgstr "z3950查詢" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 - msgid "" - "|| \n" - "Help" - msgstr "" - --- 6901,6902 ---- From acli at users.sourceforge.net Mon Feb 23 04:18:32 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:18:32 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-moredetail.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv619 Modified Files: opac-moredetail.tmpl Log Message: Comment syntax correction Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-moredetail.tmpl 22 Dec 2003 09:14:21 -0000 1.8 --- opac-moredetail.tmpl 23 Feb 2004 03:18:29 -0000 1.9 *************** *** 14,18 **** > > ! --- 14,18 ---- > > !
    From acli at users.sourceforge.net Mon Feb 23 05:00:40 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:00:40 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac.zh_TW,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8691 Modified Files: opac.zh_TW Log Message: More interim updates Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac.zh_TW 20 Feb 2004 07:25:38 -0000 1.3 --- opac.zh_TW 23 Feb 2004 04:00:38 -0000 1.4 *************** *** 15,27 **** "Content-Transfer-Encoding: 8bit\n" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:10 - #, c-format - msgid "" - "%s\n" - "(%s)" - msgstr "" - "%s\n" - "(%s)" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:11 #, c-format --- 15,18 ---- *************** *** 47,51 **** #, c-format msgid "%s acquired in the last %s days" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:15 --- 38,42 ---- #, c-format msgid "%s acquired in the last %s days" ! msgstr "最近%2$s日內新到的%1$s圖書資料" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:15 *************** *** 57,61 **** #, c-format msgid "%s, %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 --- 48,52 ---- #, c-format msgid "%s, %s" ! msgstr "%s, %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 *************** *** 63,93 **** msgstr "©" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:28 - msgid "," - msgstr "" - - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:89 - msgid "-" - msgstr "" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:20 #, c-format msgid "%s GROUP - %s " ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:56 #, c-format ! msgid "" ! "BARCODE\n" ! "%s" ! msgstr "" ! "æ¢ç¢¼\n" ! "%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 #, c-format ! msgid "%s ( record %s )" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:24 --- 54,81 ---- msgstr "©" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:20 #, c-format msgid "%s GROUP - %s " ! msgstr "%s 群組 - %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:56 #, c-format ! msgid "BARCODE %s" ! msgstr "æ¢ç¢¼ %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 #, c-format ! msgid "%s ( record %s )" ! msgstr "%s (書目記錄號碼 %s)" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:83 ! #, c-format ! msgid " Accession Date:%s" ! msgstr "登錄日期：%s" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:87 ! #, c-format ! msgid "Total Issues: %s" ! msgstr "借書次數： %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:24 *************** *** 96,99 **** --- 84,92 ---- msgstr "附加著者：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:23 + #, c-format + msgid "Author: %s" + msgstr "著者：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:91 #, c-format *************** *** 109,133 **** #, c-format msgid "Cancelled: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:36 #, c-format msgid "Classification: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:35 #, c-format msgid "Classification: %s%s%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:29 #, c-format msgid "Collection: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:77 #, c-format msgid "Current Branch: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:39 --- 102,126 ---- #, c-format msgid "Cancelled: %s" ! msgstr "已註消：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:36 #, c-format msgid "Classification: %s" ! msgstr "分類：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:35 #, c-format msgid "Classification: %s%s%s" ! msgstr "分類：%s%s%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:29 #, c-format msgid "Collection: %s" ! msgstr "館è—：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:77 #, c-format msgid "Current Branch: %s" ! msgstr "ç›®å‰é¤¨åˆ¥ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:39 *************** *** 136,148 **** msgstr "日期：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:90 #, c-format msgid "Group Number: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:71 #, c-format msgid "Home Branch: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:36 --- 129,147 ---- msgstr "日期：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:35 + #, c-format + msgid "Dewey: %s" + msgstr "æœå¨åˆ†é¡žè™Ÿï¼š%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:90 #, c-format msgid "Group Number: %s" ! msgstr "群組號碼：%s" + # XXX tentative #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:71 #, c-format msgid "Home Branch: %s" ! msgstr "您的分館：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:36 *************** *** 151,154 **** --- 150,158 ---- msgstr "國際標準書號：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:21 + #, c-format + msgid "ISBN:%s" + msgstr "國際標準書號：%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 #, c-format *************** *** 169,173 **** #, c-format msgid "LCCN: %s" ! msgstr "LCCN: %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 --- 173,177 ---- #, c-format msgid "LCCN: %s" ! msgstr "LCCN：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 *************** *** 189,198 **** #, c-format msgid "Last seen: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:33 #, c-format msgid "Loan Length: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:45 --- 193,202 ---- #, c-format msgid "Last seen: %s" ! msgstr "最近出ç¾ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:33 #, c-format msgid "Loan Length: %s" ! msgstr "借閱期é™ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:45 *************** *** 221,240 **** #, c-format msgid "Place: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:25 ! #, fuzzy, c-format msgid "Published by :%s" ! msgstr "出版：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:37 #, c-format msgid "Publisher: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:82 #, c-format msgid "Renewals: %s" ! msgstr "續借：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:34 --- 225,244 ---- #, c-format msgid "Place: %s" ! msgstr "出版地：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:25 ! #, c-format msgid "Published by :%s" ! msgstr "出版者：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:37 #, c-format msgid "Publisher: %s" ! msgstr "出版者：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:82 #, c-format msgid "Renewals: %s" ! msgstr "續借次數：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:34 *************** *** 251,260 **** #, c-format msgid "Serial:%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:43 #, c-format msgid "Size: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:30 --- 255,264 ---- #, c-format msgid "Serial:%s" ! msgstr "期刊：%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:43 #, c-format msgid "Size: %s" ! msgstr "大å°ï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:30 *************** *** 278,281 **** --- 282,290 ---- msgstr "網å€ï¼š%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:38 + #, c-format + msgid "URL: %s" + msgstr "網å€ï¼š%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:33 #, c-format *************** *** 286,290 **** #, c-format msgid "Volume: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:31 --- 295,299 ---- #, c-format msgid "Volume: %s" ! msgstr "集å¢è™Ÿï¼š%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:31 *************** *** 296,300 **** #, c-format msgid "You have a credit of %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:28 --- 305,309 ---- #, c-format msgid "You have a credit of %s" ! msgstr "您有 %s çµé¤˜" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:28 *************** *** 310,313 **** --- 319,327 ---- msgstr "　於%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:9 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:4 #, c-format *************** *** 323,331 **** msgstr "紀錄正確嗎？" - # NOTE: see http://webpac.lib.ncku.edu.tw/Webpac2/store.dll/?ID=391066&T=2 - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:84 - msgid "Accession" - msgstr "登錄" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:90 msgid "Advanced Search, More Options" --- 337,340 ---- *************** *** 358,365 **** msgstr "著者" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:23 - msgid "Author:" - msgstr "著者:" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:67 msgid "Available" --- 367,370 ---- *************** *** 394,398 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:41 msgid "Class" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:59 --- 399,403 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:41 msgid "Class" ! msgstr "類別" #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:59 *************** *** 406,414 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:29 msgid "Copies" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 msgid "Current Loan" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:49 --- 411,420 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:29 msgid "Copies" ! msgstr "數é‡" + # FIXME variable name is "status", but... #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 msgid "Current Loan" ! msgstr "ç›®å‰ç‹€æ…‹" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:49 *************** *** 416,424 **** msgstr "到期日" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:85 - #, c-format - msgid "Date:%s" - msgstr "日期：%s" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:51 #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:66 --- 422,425 ---- *************** *** 431,438 **** msgstr "å二月" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:35 - msgid "Dewey:" - msgstr "æœå¨ï¼š" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:95 msgid "Due date" --- 432,435 ---- *************** *** 441,449 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:5 msgid "Easy / Picture Books" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:6 msgid "Easy Reader" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:34 --- 438,446 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:5 msgid "Easy / Picture Books" ! msgstr "淺易/圖畫書" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:6 msgid "Easy Reader" ! msgstr "淺易讀本" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:34 *************** *** 485,492 **** msgstr "ä½å®…電話" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:21 - msgid "ISBN:" - msgstr "國際標準書號：" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" --- 482,485 ---- *************** *** 495,499 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 msgid "Item Count" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:47 --- 488,492 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 msgid "Item Count" ! msgstr "數é‡" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:47 *************** *** 501,509 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:94 msgid "Item Type" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:96 msgid "Itemtype" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 494,502 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:94 msgid "Item Type" ! msgstr "圖書資料類別" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:96 msgid "Itemtype" ! msgstr "圖書資料類別" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 518,522 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:28 msgid "Join the library" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 511,515 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:28 msgid "Join the library" ! msgstr "辦ç†è®€è€…登記手續" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 532,540 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:8 msgid "Junior Fiction" ! msgstr "å…’ç«¥å°èªª" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:7 msgid "Junior Non-Fiction" ! msgstr "å…’ç«¥éžå°èªª" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:20 --- 525,533 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:8 msgid "Junior Fiction" ! msgstr "å…’ç«¥å°èªªé¡ž" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:7 msgid "Junior Non-Fiction" ! msgstr "å…’ç«¥éžå°èªªé¡ž" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:20 *************** *** 548,552 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:8 msgid "Keywords" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:32 --- 541,545 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:8 msgid "Keywords" ! msgstr "é—œéµå­—" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:32 *************** *** 556,560 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:50 msgid "Last Seen" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:10 --- 549,553 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:50 msgid "Last Seen" ! msgstr "最近出ç¾" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:10 *************** *** 580,591 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 - msgid "Log Out" - msgstr "登出" - - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 - #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 #, c-format ! msgid "Logged in as: %s [" ! msgstr "ç›®å‰èº«ä»½ï¼š%s [" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 573,579 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 #, c-format ! msgid "Logged in as: %s [Members Home][Log Out]" ! msgstr "ç›®å‰èº«ä»½ï¼š%s ã€å€‹äººä¸»é ã€‘ã€ç™»å‡ºã€‘" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 599,607 **** msgstr "五月" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 - #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 - msgid "Members Home" - msgstr "讀者主é " - #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:70 --- 587,590 ---- *************** *** 629,633 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:27 msgid "Normal" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:89 --- 612,616 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:27 msgid "Normal" ! msgstr "一般" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:89 *************** *** 684,688 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:74 msgid "Pick Up Branch" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:107 --- 667,671 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:74 msgid "Pick Up Branch" ! msgstr "å–書處" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:107 *************** *** 692,707 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:3 msgid "Please change what's needed. An email will be sent to the library." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:85 msgid "Please confirm that you wish to request an item of these types:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:44 #, c-format ! msgid "" ! "Please select the branch from which you want to collect the item:\n" ! "\t\t%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:20 --- 675,689 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:3 msgid "Please change what's needed. An email will be sent to the library." ! msgstr "請按需è¦æ›´æ–°ï¼Œé–£ä¸‹æ‰€ä½œä¹‹ä¿®æ”¹å°‡ä»¥é›»éƒµæ–¹å¼å¯„至圖書館。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:85 msgid "Please confirm that you wish to request an item of these types:" ! msgstr "請確定您è¦é ç´„下列種類的圖書資料：" + # XXX tentative #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:44 #, c-format ! msgid "Please select the branch from which you want to collect the item: %s" ! msgstr "請指定您希望在哪間圖書館å–書《%s》" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:20 *************** *** 710,713 **** --- 692,696 ---- "matches one of these types that becomes available will be set kept for you." msgstr "" + "請您é¸æ“‡æœ‰é‚£å¹¾é¡žçš„圖書資料é©åˆæ‚¨ã€‚一有åŒé¡žçš„圖書資料å¯å€Ÿï¼Œè©²é …圖書資料會隨å³é ç•™çµ¦æ‚¨ã€‚" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:21 *************** *** 737,755 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:122 msgid "Reserve date" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:49 msgid "Reserve on this date:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:18 #, c-format msgid "Reserve page for item: %s (%s %s)" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/subject.tmpl:15 #, c-format msgid "Results %s through %s of %s records." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:122 --- 720,738 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:122 msgid "Reserve date" ! msgstr "é ç´„日期" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:49 msgid "Reserve on this date:" ! msgstr "é ç´„在這一日終止：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:18 #, c-format msgid "Reserve page for item: %s (%s %s)" ! msgstr "圖書資料《%s (%s %s)》之é ç´„é " #: ../../koha-tmpl/opac-tmpl/default/en/subject.tmpl:15 #, c-format msgid "Results %s through %s of %s records." ! msgstr "å…±%3$sç­†çµæžœä¸­çš„第%1$s至%2$sé …çµæžœ" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:122 *************** *** 778,782 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:16 msgid "Something new ?" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:4 --- 761,765 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:16 msgid "Something new ?" ! msgstr "有沒有è¦æ›´æ–°çš„？" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:4 *************** *** 824,828 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:9 msgid "Teacher Reference" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:19 --- 807,811 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:9 msgid "Teacher Reference" ! msgstr "教師åƒè€ƒæ›¸" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:19 *************** *** 840,849 **** msgstr "書å" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 - msgid "" - "Total\n" - "Issues:" - msgstr "借書總次數：" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 msgid "Total Due" --- 823,826 ---- *************** *** 851,864 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! msgid "Try another" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:87 msgid "Type in the box and press the enter key." ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:38 ! msgid "URL:" ! msgstr "網å€ï¼š" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:17 --- 828,838 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! #, c-format ! msgid "Try another search" ! msgstr "請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:87 msgid "Type in the box and press the enter key." ! msgstr "在空格輸入後，å†æŒ‰å›žè»Šéµå³å¯ã€‚" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:17 *************** *** 868,872 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:57 msgid "View Accounts" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:5 --- 842,846 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:57 msgid "View Accounts" ! msgstr "查看帳戶" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:5 *************** *** 881,885 **** #, c-format msgid "Which is to be picked up from %s." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:31 --- 855,859 ---- #, c-format msgid "Which is to be picked up from %s." ! msgstr "上列圖書資料之å–書處為%s。" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:31 *************** *** 930,942 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:66 msgid "You have reserved items waiting:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:13 msgid "You must select a branch for pickup!" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:12 msgid "You must select at least one item type!" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:6 --- 904,916 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:66 msgid "You have reserved items waiting:" ! msgstr "您有é ç´„了的圖書資料å¯ä»¥å–書：" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:13 msgid "You must select a branch for pickup!" ! msgstr "您一定è¦æ’°æ“‡åœ¨å“ªé–“分館å–書ï¼" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:12 msgid "You must select at least one item type!" ! msgstr "您一定è¦æ’°æ“‡è‡³å°‘一種圖書資料的類別ï¼" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:6 *************** *** 951,965 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 msgid "Your changes won't appear until the library has validated them." ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 ! msgid "]" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 ! msgid "][" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:105 --- 925,929 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 msgid "Your changes won't appear until the library has validated them." ! msgstr "圖書館核實您的作的修改後，修改æ‰æœƒç”Ÿæ•ˆã€‚" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:105 *************** *** 983,991 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:74 msgid "on issue bit" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! msgid "search" ! msgstr "查詢" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 --- 947,951 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:74 msgid "on issue bit" ! msgstr "借出" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 *************** *** 996,1003 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:46 msgid "to Koha" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc:8 ! msgid "||" ! msgstr "" --- 956,959 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:46 msgid "to Koha" ! msgstr "Koha" From acli at users.sourceforge.net Mon Feb 23 05:02:09 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:02:09 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8860 Modified Files: tmpl_process3.pl Log Message: Oops, forgot to take out some debugging print statements Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** tmpl_process3.pl 23 Feb 2004 01:21:03 -0000 1.6 --- tmpl_process3.pl 23 Feb 2004 04:02:06 -0000 1.7 *************** *** 35,43 **** my $key = $s; if ($s =~ /\S/s) { - print STDERR "DEBUG: before: ($key)\n"; $key = TmplTokenizer::string_canon($key); $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); $key = TmplTokenizer::quote_po($key); - print STDERR "DEBUG: after: ($key)\n"; } return defined $href->{$key} --- 35,41 ---- From acli at users.sourceforge.net Mon Feb 23 05:18:53 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:18:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en intranet-main.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11946 Modified Files: intranet-main.tmpl Log Message: Missing charset declarations. Needed for translations generated by the translation tools. Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** intranet-main.tmpl 9 Dec 2003 10:28:57 -0000 1.11 --- intranet-main.tmpl 23 Feb 2004 04:18:51 -0000 1.12 *************** *** 3,6 **** --- 3,7 ---- WELCOME TO THE KOHA INTRANET +
    /images/background-mem.gif">
    ">//images/fileopen.png"> //images/edittrash.png"> ">Normal ')">åˆ—å° æ©Ÿè®€æ ¼å¼æ›¸ç›®ï¼š
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    圖書資料
    		class="button">é ç´„
    --- NEW FILE ---

    館è—查詢

    æ¢ç¢¼ 　　或
     
    說明
    查詢：使用愈多欄ä½æŸ¥è©¢ï¼ŒæŸ¥è©¢å°±æ„ˆæ…¢ã€‚
    é—œéµå­—
    é¡Œå Normal Exact
    著者
    繪圖
    æœå¨åˆ†é¡žè™Ÿ
    類別
    或
    主題
    虛擬書架

    --- NEW FILE --- 查詢çµæžœ
    é¡Œå著者æœå¨åˆ†é¡žè™Ÿ
    &startfrom=>上一筆 &startfrom=>下一筆

    共筆記錄中的第至項。
    --- NEW FILE --- ()

    書目記錄

    副題：
    著者：
    附加著者：
    集å¢é¡Œå：
    主題：
    版權：
    備註：
    劃一題å：
    期刊：
    圖書資料總數：

    圖書資料類別 類別 館è—地 到期日 最近出ç¾
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    --- NEW FILE ---
    >é ç´„
    ()

    書目記錄

    " class="button">機讀格å¼

    國際標準書號：">
    副題：
    著者：">
    附加著者：
    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    期刊：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    圖書資料總數：

    圖書資料類別 館è—地 到期日 æœ€è¿‘å‡ºç¾ æ¢ç¢¼ Volume
    &item=&bib=&bi="> &item=>改正圖書資資類別
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    連çµè‡³ 相關網站
    é¡Œå：
    說明：
    網å€ï¼š">http://
    --> --- NEW FILE ---
    書目記錄



    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    ISBN：
    ,
    --- NEW FILE ---


    >é ç´„

    &type=intra> ()

    > >
    /images/background-mem.gif" > 群組 -
    //images/fileopen.png"> //images/edittrash.png">
    書目記錄號碼：
    圖書資料類別：
    網å€ï¼š
    借閱期é™ï¼š
    借書費用：
    分類：
    ISBN：
    出版者：
    出版地：
    日期：
    集å¢è™Ÿï¼š
    é æ•¸ï¼š
    繪圖：
    大å°ï¼š
    備註：
    數é‡ï¼š
    /images/holder.gif" width=16 height=300 align=left>
    /images/background-mem.gif">æ¢ç¢¼
    > > > //images/fileopen.png"> //images/edittrash.png">
    所屬分館：
    最近見éŽï¼š
    上次借出日期：
    上次借書讀者1：
    上次借書讀者2：
    ç›®å‰é¤¨åˆ¥ï¼š
    書價：
    圖書資料已éºå¤±ï¼š
    Paid for:
    備註：
    續借：
    &biblio=&invoice=&catview=yes">登錄日期：
    å·²å–消：
    &bi=&itm=>總借出：
    群組號碼：
    書目記錄號碼：

    --- NEW FILE ---
    您的查詢是按 您沒有指定查詢æ¢ä»¶
    找到 ç­†çµæžœ

    &=&type=opacintra>/images/numbers/prev.gif border=0> /images/numbers/placeholder.gif border=0> /images/numbers/-highlight.gif> &=&type=opacintra>/images/numbers/.gif border=0> &=&type=opacintra>/images/numbers/next.gif border=0> /images/numbers/placeholder.gif border=0>

    bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    é¡Œå著者©æ•¸é‡é¤¨è—地  
    ?type=opacintra&bib=> &type=opacintra> >é ç´„
    bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif">
    &=&type=opacintra">上一筆   &=&type=opacintra">下一筆  

    共筆記錄中的第至項。

    請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ 請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ --- NEW FILE ---
    主題
    ">上一筆 ">下一筆

    共筆記錄中的第至項。
    From acli at users.sourceforge.net Tue Feb 24 06:12:53 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 21:12:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.7,1.8 aqbookfund.tmpl,1.4,1.5 aqbudget.tmpl,1.3,1.4 authorised_values.tmpl,1.2,1.3 branches.tmpl,1.8,1.9 categorie.tmpl,NONE,1.1 categoryitem.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,1.3,1.4 itemtypes.tmpl,1.4,1.5 koha2marclinks.tmpl,1.4,1.5 marc_subfields_structure.tmpl,1.5,1.6 marctagstructure.tmpl,1.5,1.6 printers.tmpl,1.2,1.3 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,1.6,1.7 thesaurus.tmpl,1.2,1.3 z3950servers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18933/intranet-tmpl/default/zh-TW/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: New templates generated from opac.zh_TW and intranet.zh_TW --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明  
    登記有效期
    年齡上é™
    必須填寫年齡
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
     
    資料已寫入
    method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥ 是å¦
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    This record is used times. Deletion not possible
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記有效期 登記手續費 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    是 å¦ /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明 >  
    登記有效期 >
    å¹´é½¡ä¸Šé™ >
    必須填寫年齡 >
    罰款類別 >
    Bulk >
    登記手續費 >
    è¦ç™¼éŽæœŸé€šçŸ¥ >
    é™å€Ÿæ•¸é‡ >
    é ç´„手續費 >
     
    資料已寫入 method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    Bulk
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    This record is used times. Deletion not possible
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 Bulk 費用 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    修改 移除


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    測試 çµæžœ
    圖書資料號碼
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    å¥½ï¼ itemnum : the field itemnumber is mapped to a field in tab -1
    åœ–æ›¸è³‡æ–™ç›¸é—œæ¬„ä½ åœ–æ›¸è³‡æ–™çš„æ‰€æœ‰æ¬„ä½éƒ½å¿…須：
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    å¥½ï¼ All item fields are in the same tag and in item tab
    itemtypes table 是空白的 itemtypes table是空白的，它必須有至少一個值
    å¥½ï¼ itemtypes table 有至少一個值
    itemtype NOT mapped biblioitems.itemtype欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為itemtype
    		•
    å¥½ï¼ biblioitems.itemtype 已設定
    branch table 是空白的 branch table是空白的，它必須至少有一個值ï¼
    å¥½ï¼ branch table 有至少一個值
    homebranch 沒有éˆçµ items.homebranch欄必須
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ homebranch 已設定
    holdingbranch 沒有éˆçµ items.holdingbranch欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ holdingbranch 已設定
    書目åŠæ›¸ç›®è¨˜éŒ„號碼 biblio.biblionumber åŠ biblioitems.biblioitemnumber 欄ä½å¿…須：
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    å¥½ï¼ biblionumber åŠ biblioitemnumber å·²éˆçµå¦¥ç•¶
    總計 您的機讀格å¼è¨­å®šæœ‰å€‹éŒ¯èª¤ã€‚使用Kohaå‰è«‹å…ˆè¦æ”¹æ­£å®ƒå€‘。
      Configuration OK, you don't have errors in your MARC parameters table
    --- NEW FILE ---

    修改字眼

    新增字眼

    字眼
    字眼
    資料已寫入
    字眼
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Stop word 管ç†

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    您查詢
    字眼
    移除
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    --- NEW FILE ---

    修改Z39.50伺æœå™¨

    新增Z39.50伺æœå™¨

    Z39.50伺æœå™¨
    Z39.50伺æœå™¨
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨ (查詢時é è¨­ç‚ºä½¿ç”¨)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    資料已寫入
    >
    å稱
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨
    Rank
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Z39.50伺æœå™¨ç®¡ç†

    >
    您查詢
    å稱 主機å稱 埠 資料庫 使用者ID 密碼 é è¨­ä½¿ç”¨ Rank Syntax
    //images/fileopen.png" alt="修改" title="修改" border=0> //images/edittrash.png" alt="移除" title="移除" border=0>
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    From acli at users.sourceforge.net Tue Feb 24 07:07:07 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 22:07:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue MARCdetail.tmpl,NONE,1.1.2.1 catalogue-home.tmpl,NONE,1.1.2.1 cmsdsearchresults.tmpl,NONE,1.1.2.1 detail-opac.tmpl,NONE,1.1.2.1 detail.tmpl,NONE,1.1.2.1 detailprint.tmpl,NONE,1.1.2.1 moredetail.tmpl,NONE,1.1.2.1 searchresults.tmpl,NONE,1.1.2.1 subject.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28329/intranet-tmpl/default/zh-TW/catalogue Added Files: Tag: rel_2_0 MARCdetail.tmpl catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl detailprint.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Log Message: CVS seems to hate branches, or something Really Bad like that. I hope I have done the correct things to add these missing files back. --- NEW FILE ---
    /images/background-mem.gif">
    ">//images/fileopen.png"> //images/edittrash.png"> ">一般 ')">åˆ—å° ')">新增至虛擬書架 機讀格å¼æ›¸ç›®ï¼š
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    圖書資料
    		class="button">é ç´„
    --- NEW FILE ---

    館è—查詢

    æ¢ç¢¼ 　　或
     
    說明
    查詢：使用愈多欄ä½æŸ¥è©¢ï¼ŒæŸ¥è©¢å°±æ„ˆæ…¢ã€‚
    é—œéµå­—
    é¡Œå 一般 Exact
    著者
    繪圖
    æœå¨åˆ†é¡žè™Ÿ
    類別
    或
    主題
    虛擬書架

    --- NEW FILE --- 查詢çµæžœ
    é¡Œå著者æœå¨åˆ†é¡žè™Ÿ
    &startfrom=>上一筆 &startfrom=>下一筆

    共筆記錄中的第至項。
    --- NEW FILE --- ()

    書目記錄

    副題：
    著者：
    附加著者：
    集å¢é¡Œå：
    主題：
    版權：
    備註：
    劃一題å：
    期刊：
    圖書資料總數：

    圖書資料類別 類別 館è—地 到期日 最近出ç¾
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    --- NEW FILE ---
    >é ç´„
    ()

    書目記錄

    " class="button">機讀格å¼

    國際標準書號：">
    副題：
    著者：">
    附加著者：
    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    期刊：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    圖書資料總數：

    圖書資料類別 館è—地 到期日 æœ€è¿‘å‡ºç¾ æ¢ç¢¼ Volume
    &item=&bib=&bi="> &item=>改正圖書資資類別
    網站 上線 å¯ç”¨ &bib=&bi=">http://


    連çµè‡³ 相關網站
    é¡Œå：
    說明：
    網å€ï¼š">http://
    --> --- NEW FILE ---
    書目記錄



    出版者： 　出版年： , ,
    館è—：
    主題：
    著作年：
    備註：
    劃一題å：
    æœå¨åˆ†é¡žè™Ÿï¼š">
    分類：
    LCCN：
    網å€ï¼š">
    ISBN：
    ,
    --- NEW FILE ---


    >é ç´„

    &type=intra> ()

    > >
    /images/background-mem.gif" > 群組 -
    //images/fileopen.png"> //images/edittrash.png">
    書目記錄號碼：
    圖書資料類別：
    網å€ï¼š
    借閱期é™ï¼š
    借書費用：
    分類：
    ISBN：
    出版者：
    出版地：
    日期：
    集å¢è™Ÿï¼š
    é æ•¸ï¼š
    繪圖：
    大å°ï¼š
    備註：
    數é‡ï¼š
    /images/holder.gif" width=16 height=300 align=left>
    /images/background-mem.gif">æ¢ç¢¼
    > > > //images/fileopen.png"> //images/edittrash.png">
    所屬分館：
    最近見éŽï¼š
    上次借出日期：
    上次借書讀者1：
    上次借書讀者2：
    ç›®å‰é¤¨åˆ¥ï¼š
    書價：
    圖書資料已éºå¤±ï¼š
    Paid for:
    備註：
    續借：
    &biblio=&invoice=&catview=yes">登錄日期：
    å·²å–消：
    &bi=&itm=>總借出：
    群組號碼：
    書目記錄號碼：

    --- NEW FILE ---
    您的查詢是按 您沒有指定查詢æ¢ä»¶
    找到 ç­†çµæžœ

    &=&type=opacintra>/images/numbers/prev.gif border=0> /images/numbers/placeholder.gif border=0> /images/numbers/-highlight.gif> &=&type=opacintra>/images/numbers/.gif border=0> &=&type=opacintra>/images/numbers/next.gif border=0> /images/numbers/placeholder.gif border=0>

    bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    é¡Œå著者©æ•¸é‡é¤¨è—地  
    ?type=opacintra&bib=> &type=opacintra> >é ç´„ ä¸å¯é ç´„
    bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    &=&type=opacintra>上一筆   &=&type=opacintra>下一筆  

    共筆記錄中的第至項。

    請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ 請以別的æ¢ä»¶é‡è©¦æŸ¥è©¢ --- NEW FILE ---
    主題
    ">上一筆 ">下一筆

    共筆記錄中的第至項。
    From acli at users.sourceforge.net Tue Feb 24 07:07:13 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 22:07:13 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3.2.3,1.3.2.4 aqbookfund.tmpl,1.2.2.2,1.2.2.3 aqbudget.tmpl,1.2.2.1,1.2.2.2 authorised_values.tmpl,1.1.2.1,1.1.2.2 branches.tmpl,1.6.2.2,1.6.2.3 categorie.tmpl,NONE,1.1.2.1 categoryitem.tmpl,NONE,1.1.2.1 charges.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 currency.tmpl,1.1.2.3,1.1.2.4 itemtypes.tmpl,1.2.2.1,1.2.2.2 koha2marclinks.tmpl,1.3.2.1,1.3.2.2 marc_subfields_structure.tmpl,1.4.2.1,1.4.2.2 marctagstructure.tmpl,1.4.2.1,1.4.2.2 printers.tmpl,1.1.2.2,1.1.2.3 stopwords.tmpl,NONE,1.1.2.1 systempreferences.tmpl,1.3.2.3,1.3.2.4 thesaurus.tmpl,1.1.2.1,1.1.2.2 z3950servers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28329/intranet-tmpl/default/zh-TW/parameters Added Files: Tag: rel_2_0 admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: CVS seems to hate branches, or something Really Bad like that. I hope I have done the correct things to add these missing files back. --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明  
    登記有效期
    年齡上é™
    必須填寫年齡
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
     
    資料已寫入
    method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥ 是å¦
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    這個記錄目å‰ç”¨äº† 次，ä¸å¯ç§»é™¤
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記有效期 登記手續費 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    是 å¦ /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    --- NEW FILE ---

    修改類別

    新增類別

    name=Aform method=post>
    類別編號 >
    類別編號
    說明 >  
    登記有效期 >
    å¹´é½¡ä¸Šé™ >
    必須填寫年齡 >
    罰款類別 >
    Bulk >
    登記手續費 >
    è¦ç™¼éŽæœŸé€šçŸ¥ >
    é™å€Ÿæ•¸é‡ >
    é ç´„手續費 >
     
    資料已寫入 method=post>
    總計：：
    > 資料已移除

    類別管ç†

    您查詢 >
    類別編號
    說明
    登記有效期
    年齡上é™
    必須填寫年齡
    罰款類別
    Bulk
    登記手續費
    è¦ç™¼éŽæœŸé€šçŸ¥
    é™å€Ÿæ•¸é‡
    é ç´„手續費
    這個記錄目å‰ç”¨äº† 次，ä¸å¯ç§»é™¤
    確定è¦ç§»é™¤å—Ž
    類別 說明 登記 å¹´é½¡ä¸Šé™ å¿…é ˆå¡«å¯«å¹´é½¡ 罰款 Bulk 費用 éŽæœŸ é™å€Ÿæ•¸é‡ é ç´„
    修改 移除


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    測試 çµæžœ
    圖書資料號碼
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    å¥½ï¼ itemnum : the field itemnumber is mapped to a field in tab -1
    åœ–æ›¸è³‡æ–™ç›¸é—œæ¬„ä½ åœ–æ›¸è³‡æ–™çš„æ‰€æœ‰æ¬„ä½éƒ½å¿…須：
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    å¥½ï¼ All item fields are in the same tag and in item tab
    itemtypes table 是空白的 itemtypes table是空白的，它必須有至少一個值
    å¥½ï¼ itemtypes table 有至少一個值
    itemtype NOT mapped biblioitems.itemtype欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為itemtype
    		•
    å¥½ï¼ biblioitems.itemtype 已設定
    branch table 是空白的 branch table是空白的，它必須至少有一個值ï¼
    å¥½ï¼ branch table 有至少一個值
    homebranch 沒有éˆçµ items.homebranch欄必須
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ homebranch 已設定
    holdingbranch 沒有éˆçµ items.holdingbranch欄必須：
  • be mapped to a MARC subfield,
  • å°æ‡‰çš„分欄必須設定容許值為branches
    		•
    å¥½ï¼ holdingbranch 已設定
    書目åŠæ›¸ç›®è¨˜éŒ„號碼 biblio.biblionumber åŠ biblioitems.biblioitemnumber 欄ä½å¿…須：
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    å¥½ï¼ biblionumber åŠ biblioitemnumber å·²éˆçµå¦¥ç•¶
    總計 您的機讀格å¼è¨­å®šæœ‰å€‹éŒ¯èª¤ã€‚使用Kohaå‰è«‹å…ˆè¦æ”¹æ­£å®ƒå€‘。
      Configuration OK, you don't have errors in your MARC parameters table
    --- NEW FILE ---

    修改字眼

    新增字眼

    字眼
    字眼
    資料已寫入
    字眼
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Stop word 管ç†

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    您查詢
    字眼
    移除
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    --- NEW FILE ---

    修改Z39.50伺æœå™¨

    新增Z39.50伺æœå™¨

    Z39.50伺æœå™¨
    Z39.50伺æœå™¨
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨ (查詢時é è¨­ç‚ºä½¿ç”¨)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    資料已寫入
    >
    å稱
    主機å稱
    埠
    資料庫
    使用者ID
    密碼
    é è¨­ä½¿ç”¨
    Rank
    確定è¦ç§»é™¤å—Ž
    資料已移除

    Z39.50伺æœå™¨ç®¡ç†

    >
    您查詢
    å稱 主機å稱 埠 資料庫 使用者ID 密碼 é è¨­ä½¿ç”¨ Rank Syntax
    //images/fileopen.png" alt="修改" title="修改" border=0> //images/edittrash.png" alt="移除" title="移除" border=0>
    << ä¸Šä¸€é         ä¸‹ä¸€é  >>

    From acli at users.sourceforge.net Tue Feb 24 15:20:49 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 06:20:49 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.12,1.13 xgettext.pl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23699 Modified Files: tmpl_process3.pl xgettext.pl Log Message: tmpl_process3.pl did not know how to handle absolute pathnames in -i. (Actually, xgettext.pl did not know how to handle them in the files listed in the list of files.) If the po file is empty (corrupted), $href->{'""'} will be undefined. We just blindly dereferenced this null value without checking. Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** tmpl_process3.pl 24 Feb 2004 00:47:53 -0000 1.12 --- tmpl_process3.pl 24 Feb 2004 14:20:46 -0000 1.13 *************** *** 222,225 **** --- 222,227 ---- # guess the charsets. HTML::Templates defaults to iso-8859-1 if (defined $href) { + die "$str_file: PO file is corrupted, or not a PO file\n" + unless defined $href->{'""'}; $charset_out = TmplTokenizer::charset_canon $2 if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/; *************** *** 242,246 **** if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added ! die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); # Generate the temporary file that acts as /POTFILES.in --- 244,252 ---- if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added ! if (!-s $str_file) { ! warn "Removing empty file $str_file\n"; ! unlink $str_file || die "$str_file: $!\n"; ! } ! die "$str_file: Output file already exists\n" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); # Generate the temporary file that acts as /POTFILES.in Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** xgettext.pl 24 Feb 2004 00:48:18 -0000 1.8 --- xgettext.pl 24 Feb 2004 14:20:46 -0000 1.9 *************** *** 292,299 **** while () { chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! print STDERR "$0: Processing file \"$directory/$_\"\n" if $verbose_p; text_extract( $h ); } --- 292,300 ---- while () { chomp; ! my $input = /^\//? $_: "$directory/$_"; ! my $h = TmplTokenizer->new( $input ); $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name $input; ! print STDERR "$0: Processing file \"$input\"\n" if $verbose_p; text_extract( $h ); } From oleonard at users.sourceforge.net Tue Feb 24 17:17:24 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:17:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.18.2.1,1.18.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18004/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: Tag: rel_2_0 branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Also quoted all attributes in HTML. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -C2 -r1.18.2.1 -r1.18.2.2 *** branches.tmpl 6 Feb 2004 14:12:27 -0000 1.18.2.1 --- branches.tmpl 24 Feb 2004 16:17:22 -0000 1.18.2.2 *************** *** 1,18 **** ! !


    !
    ! --- 1,18 ---- ! !


    ! " name="Aform" method="post"> !
    Branch code ! ! ! !
    *************** *** 20,31 **** ! ! ! ! --- 20,31 ---- ! ! ! ! *************** *** 34,62 **** ! ! ! ! ! ! !
    Branch code ! ! "> ! ! ">
    Name"> 
    >
    Name"> 
    " >
    Address
     
     
    Phone
    Fax
    E-mail
     
    --- 34,62 ----
    Address">
     ">
     ">
    Phone">
    Fax">
    E-mail">
     
    *************** *** 64,138 **** ! Confirm delete: ! ! ! > !

    ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 64,138 ---- ! Confirm delete: ! " method="post"> ! ! > ! " method="post"> ! !


    ! !
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    ! ! !
    		!
    ! !
    ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! *************** *** 141,179 ****
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    " method="post"> ! ! "> !
    		!
    " method="post"> ! "> !

    !
    method=post> ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 141,179 ----
    ! Branches Categories
    NameCodeDescription    
    !
    ! !
    		!
    ! !

    !
    method="post"> ! !

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! *************** *** 182,204 ****
    ! Branches Categories
    NameCodeDescription    
    !
    " method="post"> ! ! ">
    		!
    " method="post"> ! "> !

    !
    method=post> ! !
    ! !


    !
    ! --- 182,204 ----
    Category code ! ! ! !

    ! method="post"> ! !
    ! !


    !
    " name="Aform" method="post"> ! *************** *** 206,217 **** ! ! !
    Category code ! ! "> ! ! ">
    Name"> 
    Description"> 
    --- 206,217 ----
    Name"> 
    Description"> 
    *************** *** 219,230 **** ! Confirm delete: ! ! ! !
    --- 219,230 ---- ! Confirm delete: !
    " method="post"> ! ! ">
    !
    " method="post">
    From oleonard at users.sourceforge.net Tue Feb 24 17:40:14 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:40:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23510/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Also quoted all attributes in HTML. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** branches.tmpl 11 Feb 2004 09:02:55 -0000 1.19 --- branches.tmpl 24 Feb 2004 16:40:11 -0000 1.20 *************** *** 1,18 **** ! !


    !
    ! --- 1,18 ---- ! !


    ! " name="Aform" method="post"> !
    Branch code ! ! ! !
    *************** *** 20,31 **** ! ! ! ! --- 20,31 ---- ! ! ! ! *************** *** 34,62 **** ! ! ! ! ! ! !
    Branch code ! ! "> ! ! ">
    Name"> 
    >
    Name"> 
    " >
    Address
     
     
    Phone
    Fax
    E-mail
     
    --- 34,62 ---- Address ! ">   ! ">   ! "> Phone ! "> Fax ! "> E-mail ! ">   ! *************** *** 64,138 **** ! Confirm delete: ! ! ! >
    !
    ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 64,138 ---- ! Confirm delete: ! " method="post"> ! ! > ! " method="post"> ! !


    ! !
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    ! ! !
    		!
    ! !
    ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! *************** *** 141,179 ****
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    " method="post"> ! ! "> !
    		!
    " method="post"> ! "> !

    !
    method=post> ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 141,179 ----
    ! Branches Categories
    NameCodeDescription    
    !
    ! !
    		!
    ! !

    !
    method="post"> ! !

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! *************** *** 182,204 ****
    ! Branches Categories
    NameCodeDescription    
    !
    " method="post"> ! ! ">
    		!
    " method="post"> ! "> !

    !
    method=post> ! !
    ! !


    !
    ! --- 182,204 ----
    Category code ! ! ! !

    ! method="post"> ! !
    ! !


    !
    " name="Aform" method="post"> ! *************** *** 206,217 **** ! ! !
    Category code ! ! "> ! ! ">
    Name"> 
    Description"> 
    --- 206,217 ---- Name ! ">  Description ! ">  ! *************** *** 219,230 **** ! Confirm delete: ! ! !
    !
    --- 219,230 ---- ! Confirm delete: !
    " method="post"> ! ! ">
    !
    " method="post">
    From oleonard at users.sourceforge.net Tue Feb 24 17:41:25 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:41:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters branches.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23736/koha-tmpl/intranet-tmpl/npl/en/parameters Modified Files: branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/branches.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** branches.tmpl 19 Feb 2004 19:14:35 -0000 1.1 --- branches.tmpl 24 Feb 2004 16:41:14 -0000 1.2 *************** *** 16,20 **** ! " /> --- 16,20 ---- ! " /> From acli at users.sourceforge.net Wed Feb 25 04:37:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 19:37:29 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator VerboseWarnings.pm,1.3,1.4 tmpl_process3.pl,1.13,1.14 xgettext.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9253 Modified Files: VerboseWarnings.pm tmpl_process3.pl xgettext.pl Log Message: Benedict wants some message at the end that says success or failure. It's a good idea too. Index: VerboseWarnings.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/VerboseWarnings.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** VerboseWarnings.pm 23 Feb 2004 19:56:47 -0000 1.3 --- VerboseWarnings.pm 25 Feb 2004 03:37:27 -0000 1.4 *************** *** 26,37 **** --- 26,44 ---- @EXPORT_OK = qw( &pedantic_p + &warn_additional &warn_normal &warn_pedantic + &error_additional &error_normal ); + %EXPORT_TAGS = ( + 'warn' => [ 'warn_additional', 'warn_normal', 'warn_pedantic' ], + 'die' => [ 'error_additional', 'error_normal' ], + ); ############################################################################### use vars qw( $appName $input $input_abbr $pedantic_p $pedantic_tag ); + use vars qw( $warned $erred ); sub set_application_name ($) { *************** *** 40,43 **** --- 47,54 ---- } + sub application_name () { + return $appName; + } + sub set_input_file_name ($) { my($s) = @_; *************** *** 71,75 **** } ! sub warn_normal ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('Warning', $lc); --- 82,86 ---- } ! sub warn_additional ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('Warning', $lc); *************** *** 78,81 **** --- 89,98 ---- } + sub warn_normal ($$) { + my($msg, $lc) = @_; + $warned += 1; + warn_additional($msg, $lc); + } + sub warn_pedantic ($$$) { my($msg, $lc, $flag) = @_; *************** *** 88,94 **** $$flag = 1; } } ! sub error_normal ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('ERROR', $lc); --- 105,112 ---- $$flag = 1; } + $warned += 1; } ! sub error_additional ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('ERROR', $lc); *************** *** 97,99 **** --- 115,127 ---- } + sub error_normal ($$) { + my($msg, $lc) = @_; + $erred += 1; + error_additional($msg, $lc); + } + + sub warned () { + return $warned; # number of times warned + } + ############################################################################### Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** tmpl_process3.pl 24 Feb 2004 14:20:46 -0000 1.13 --- tmpl_process3.pl 25 Feb 2004 03:37:27 -0000 1.14 *************** *** 17,21 **** use File::Temp qw( :POSIX ); use TmplTokenizer; ! use VerboseWarnings qw( error_normal warn_normal ); ############################################################################### --- 17,21 ---- use File::Temp qw( :POSIX ); use TmplTokenizer; ! use VerboseWarnings qw( :warn :die ); ############################################################################### *************** *** 150,153 **** --- 150,154 ---- The -o option is ignored for the "create" and "update" actions. + Try `perldoc $0' for perhaps more information. EOF exit($exitcode); *************** *** 155,158 **** --- 156,160 ---- ############################################################################### + sub usage_error (;$) { for my $msg (split(/\n/, $_[0])) { *************** *** 241,244 **** --- 243,247 ---- my $xgettext = './xgettext.pl'; # actual text extractor script + my $st; if ($action eq 'create') { *************** *** 256,262 **** close $tmph; # Generate the specified po file ($str_file) ! my $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file); warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0; ! unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { --- 259,265 ---- close $tmph; # Generate the specified po file ($str_file) ! $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file); warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0; ! # unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { *************** *** 270,274 **** close $tmph1; # Generate the temporary file that acts as /.pot ! my $st = system($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2, '--po-mode', (defined $charset_in? ('-I', $charset_in): ()), --- 273,277 ---- close $tmph1; # Generate the temporary file that acts as /.pot ! $st = system($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2, '--po-mode', (defined $charset_in? ('-I', $charset_in): ()), *************** *** 278,288 **** # FIXME: msgmerge(1) is a Unix dependency # FIXME: need to check the return value ! system('msgmerge', '-U', '-s', $str_file, $tmpfile2); } else { ! warn_normal "Text extraction failed: $xgettext: $!\n", undef; ! warn_normal "Will not run msgmerge\n", undef; } ! unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; ! unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { --- 281,291 ---- # FIXME: msgmerge(1) is a Unix dependency # FIXME: need to check the return value ! $st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2); } else { ! error_normal "Text extraction failed: $xgettext: $!\n", undef; ! error_additional "Will not run msgmerge\n", undef; } ! # unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; ! # unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { *************** *** 329,332 **** --- 332,342 ---- usage_error('Unknown action specified.'); } + + if ($st == 0) { + printf "The %s seems to be successful, with %d warning(s).\n", + $action, VerboseWarnings::warned; + } else { + printf "%s FAILED.\n", "\u$action"; + } exit 0; Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** xgettext.pl 24 Feb 2004 14:20:46 -0000 1.9 --- xgettext.pl 25 Feb 2004 03:37:27 -0000 1.10 *************** *** 237,240 **** --- 237,242 ---- Informative output: --help Display this help and exit + + Try `perldoc $0' for perhaps more information. EOF exit($exitcode); From acli at users.sourceforge.net Wed Feb 25 04:40:03 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 19:40:03 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.14,1.15 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9623 Modified Files: tmpl_process3.pl Log Message: Bug in previous checkin, because we can't get the number of warnings from the child. Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** tmpl_process3.pl 25 Feb 2004 03:37:27 -0000 1.14 --- tmpl_process3.pl 25 Feb 2004 03:39:49 -0000 1.15 *************** *** 334,339 **** if ($st == 0) { ! printf "The %s seems to be successful, with %d warning(s).\n", ! $action, VerboseWarnings::warned; } else { printf "%s FAILED.\n", "\u$action"; --- 334,338 ---- if ($st == 0) { ! printf "The %s seems to be successful.\n", $action; } else { printf "%s FAILED.\n", "\u$action"; From acli at users.sourceforge.net Wed Feb 25 07:08:46 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:08:46 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1842 Modified Files: TmplTokenizer.pm Log Message: This should make it handle commenting out of whole blocks of HTML better. It seems to be still correct, and it is no longer complaining about syntax errors when seeing commented-out HTML (esp. with TMPL_* directives). Don't try to translate stuff between ... too, the stuff in the middle is supposed to be PCDATA. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** TmplTokenizer.pm 23 Feb 2004 18:49:56 -0000 1.25 --- TmplTokenizer.pm 25 Feb 2004 06:08:41 -0000 1.26 *************** *** 34,37 **** --- 34,38 ---- use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); + use vars qw( $pedantic_error_markup_in_pcdata_p ); ############################################################################### *************** *** 63,67 **** # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; --- 64,68 ---- # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:(?!--)(?:$re_directive)*.)*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; *************** *** 92,95 **** --- 93,97 ---- sub CDATA_MODE_P () {'cdata-mode-p'} sub CDATA_CLOSE () {'cdata-close'} + sub PCDATA_MODE_P () {'pcdata-mode-p'} # additional submode for CDATA sub ALLOW_CFORMAT_P () {'allow-cformat-p'} *************** *** 163,166 **** --- 165,173 ---- } + sub pcdata_mode_p { + my $this = shift; + return $this->{+PCDATA_MODE_P}; + } + sub cdata_close { my $this = shift; *************** *** 228,231 **** --- 235,244 ---- } + sub _set_pcdata_mode { + my $this = shift; + $this->{+PCDATA_MODE_P} = $_[0]; + return $this; + } + sub _set_cdata_close { my $this = shift; *************** *** 321,324 **** --- 334,338 ---- } else { # tag/declaration/processing instruction my $ok_p = 0; + my $bad_comment_p = 0; for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { *************** *** 350,359 **** warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; } ! } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); $this->_set_readahead( $' ); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $this->line_number_start; ! $this->_set_syntaxerror( 1 ); } last if $ok_p; --- 364,372 ---- warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; } ! } elsif ($this->_peek_readahead =~ /^)$re_directive*.)*-->/os) { ($kind, $it) = (TmplTokenType::COMMENT, $&); $this->_set_readahead( $' ); $ok_p = 1; ! $bad_comment_p = 1; } last if $ok_p; *************** *** 377,380 **** --- 390,397 ---- if ($it =~ /^$re_directive/ios && !$this->cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; + } elsif ($bad_comment_p) { + warn_normal sprintf("Syntax error in comment: %s\n", $it), + $this->line_number_start; + $this->_set_syntaxerror( 1 ); } if (!$ok_p && $eof_p) { *************** *** 401,404 **** --- 418,426 ---- $this->_set_cdata_mode( 1 ); $this->_set_cdata_close( "" ); + $this->_set_pcdata_mode( 0 ); + } elsif ($it->string =~ /^<(title)\b/is) { + $this->_set_cdata_mode( 1 ); + $this->_set_cdata_close( "" ); + $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); *************** *** 415,419 **** --- 437,449 ---- $it .= $next->string; } + if ($this->pcdata_mode_p) { + my $check = $it; + $check =~ s/$re_directive//gos; + warn_pedantic "Markup found in PCDATA\n", $this->line_number, + \$pedantic_error_markup_in_pcdata_p + if $check =~ /$re_tag_compat/s; + } $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); + $this->_set_pcdata_mode, 0; $this->_set_cdata_close, undef; } From acli at users.sourceforge.net Wed Feb 25 07:25:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:25:31 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.26,1.27 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4769 Modified Files: TmplTokenizer.pm Log Message: After the previous change, the scanner will hang if the input is malformed in a certain way, such as having a but not matching . This should fix it. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** TmplTokenizer.pm 25 Feb 2004 06:08:41 -0000 1.26 --- TmplTokenizer.pm 25 Feb 2004 06:25:29 -0000 1.27 *************** *** 427,433 **** } } else { for ($it = '', my $cdata_close = $this->cdata_close;;) { my $next = $this->_next_token_internal($h); ! last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/is) { $this->_push_readahead( $next ); # push entire TmplToken object --- 427,435 ---- } } else { + my $eof_p = 0; for ($it = '', my $cdata_close = $this->cdata_close;;) { my $next = $this->_next_token_internal($h); ! $eof_p = !defined $next; ! last if $eof_p; if (defined $next && $next->string =~ /$cdata_close/is) { $this->_push_readahead( $next ); # push entire TmplToken object *************** *** 437,440 **** --- 439,450 ---- $it .= $next->string; } + if ($eof_p) { + $it = undef; + error_normal "Unexpected end of file while looking for " + . $this->cdata_close + . "\n", $this->line_number_start; + $this->_set_fatal( 1 ); + $this->_set_syntaxerror( 1 ); + } if ($this->pcdata_mode_p) { my $check = $it; *************** *** 444,450 **** if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); $this->_set_pcdata_mode, 0; ! $this->_set_cdata_close, undef; } return $it; --- 454,461 ---- if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ) ! if defined $it; $this->_set_pcdata_mode, 0; ! $this->_set_cdata_close, undef unless !defined $it; } return $it; From acli at users.sourceforge.net Wed Feb 25 07:49:37 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:49:37 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.27,1.28 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9557 Modified Files: TmplTokenizer.pm Log Message: Try to be a little bit more helpful with "Strange attribute syntax..." warnings. (Actually, is syntax like foo="bar"foo="bar" actually valid?) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** TmplTokenizer.pm 25 Feb 2004 06:25:29 -0000 1.27 --- TmplTokenizer.pm 25 Feb 2004 06:49:35 -0000 1.28 *************** *** 296,300 **** $this->_set_fatal( 1 ); } else { ! warn_normal "Strange attribute syntax: $s\n", $lc; } } --- 296,306 ---- $this->_set_fatal( 1 ); } else { ! # There's something wrong with the attribute syntax. ! # We might be able to deduce a likely cause by looking more. ! if ($s =~ /^[a-z0-9]/is && "" =~ /^$re_tag_compat$/s) { ! warn_normal "Probably missing whitespace before or missing quotation mark near: $s\n", $lc; ! } else { ! warn_normal "Strange attribute syntax: $s\n", $lc; ! } } } From acli at users.sourceforge.net Wed Feb 25 07:56:44 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:56:44 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.28,1.29 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10792 Modified Files: TmplTokenizer.pm Log Message: Ugly hack to avoid screenfuls of spurious warnings about "Possible SGML closed tag notation" Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** TmplTokenizer.pm 25 Feb 2004 06:49:35 -0000 1.28 --- TmplTokenizer.pm 25 Feb 2004 06:56:42 -0000 1.29 *************** *** 362,367 **** --- 362,373 ---- if ($tail eq '' && $post =~ $re_tmpl_var) { # Don't bother to show the warning if we're too confused + # FIXME. There's no method for _closed_start_tag_warning + if (!defined $this->{'_closed_start_tag_warning'} + || ($this->{'_closed_start_tag_warning'}->[0] eq $head + && $this->{'_closed_start_tag_warning'}->[1] != $this->line_number - 1)) { warn_normal "Possible SGML \"closed start tag\" notation: $head<\n", $this->line_number if split(/\n/, $head) < 10; + } + $this->{'_closed_start_tag_warning'} = [$head, $this->line_number]; } else { ($kind, $it) = (TmplTokenType::TAG, "$head>"); From acli at users.sourceforge.net Wed Feb 25 09:16:27 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Wed, 25 Feb 2004 00:16:27 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.29,1.30 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23579 Modified Files: TmplTokenizer.pm Log Message: This should now handle spurious "strange attribute syntax" much more sanely. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** TmplTokenizer.pm 25 Feb 2004 06:56:42 -0000 1.29 --- TmplTokenizer.pm 25 Feb 2004 08:16:24 -0000 1.30 *************** *** 259,264 **** my($s, $lc) = @_; my %attr; ! $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { --- 259,264 ---- my($s, $lc) = @_; my %attr; ! $s = $1 if $s =~ /^<(?:(?!$re_directive_control)\S)+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<(?:(?!$re_directive_control)\S)+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { *************** *** 431,438 **** $this->_set_cdata_close( "" ); $this->_set_pcdata_mode( 0 ); ! } elsif ($it->string =~ /^<(title)\b/is) { ! $this->_set_cdata_mode( 1 ); ! $this->_set_cdata_close( "" ); ! $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); --- 431,438 ---- $this->_set_cdata_close( "" ); $this->_set_pcdata_mode( 0 ); ! # } elsif ($it->string =~ /^<(title)\b/is) { ! # $this->_set_cdata_mode( 1 ); ! # $this->_set_cdata_close( "" ); ! # $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); *************** *** 466,470 **** if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ) if defined $it; $this->_set_pcdata_mode, 0; --- 466,475 ---- if $check =~ /$re_tag_compat/s; } ! # PCDATA should be treated as text, not CDATA ! # Actually it should be treated as TEXT_PARAMETRIZED :-( ! $it = TmplToken->new( $it, ! ($this->pcdata_mode_p? ! TmplTokenType::TEXT: TmplTokenType::CDATA), ! $this->line_number ) if defined $it; $this->_set_pcdata_mode, 0; *************** *** 856,859 **** --- 861,868 ---- turned on using the set_cformat(1) method call. + =head1 BUGS + + There is no code to save the tag name anywhere in the scanned token. + =head1 HISTORY From acli at users.sourceforge.net Wed Feb 25 09:16:37 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Wed, 25 Feb 2004 00:16:37 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.17,1.18 opac.zh_TW,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23668 Modified Files: intranet.zh_TW opac.zh_TW Log Message: Minor updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** intranet.zh_TW 24 Feb 2004 00:48:18 -0000 1.17 --- intranet.zh_TW 25 Feb 2004 08:16:34 -0000 1.18 *************** *** 4,7 **** --- 4,9 ---- # Copyright 2004 Ambrose Li # + # $Header$ + # # FIXME words tentatively translated: active, home branch, illustration, illustrator, inactive, order, receive, seen # FIXME tentative: bookfund: 書ç±è³¼ç½®è³‡é‡‘ *************** *** 12,16 **** msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-23 17:20-0500\n" "Last-Translator: Ambrose Li \n" --- 14,18 ---- msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-25 03:08-0500\n" "PO-Revision-Date: 2004-02-23 17:20-0500\n" "Last-Translator: Ambrose Li \n" *************** *** 25,32 **** msgstr "\" %s" - #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:41 - msgid "\">" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:14 msgid "$ rrp" --- 27,30 ---- *************** *** 573,581 **** msgstr "-) 借出" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:131 - #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:44 - msgid "-->" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:108 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:165 --- 571,574 ---- *************** *** 641,645 **** msgstr "-> 供應商" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:3 msgid "2; url=" msgstr "" --- 634,638 ---- msgstr "-> 供應商" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:4 msgid "2; url=" msgstr "" *************** *** 832,840 **** msgstr "日期：%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:123 - #, c-format - msgid "Description: %s" - msgstr "說明：%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:50 #, c-format --- 825,828 ---- *************** *** 1073,1082 **** #, c-format msgid "This record is used %s times. Deletion not possible" ! msgstr "" ! ! #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:122 ! #, c-format ! msgid "Title: %s" ! msgstr "é¡Œå：%s" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:31 --- 1061,1065 ---- #, c-format msgid "This record is used %s times. Deletion not possible" ! msgstr "這個記錄目å‰ç”¨äº† %s 次，ä¸å¯ç§»é™¤" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:31 *************** *** 1108,1116 **** msgstr "網å€ï¼š%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:124 - #, c-format - msgid "URL:http://%s" - msgstr "網å€ï¼šhttp://%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:29 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:39 --- 1091,1094 ---- *************** *** 1293,1297 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:28 msgid "ACTUAL" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:73 --- 1271,1275 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:28 msgid "ACTUAL" ! msgstr "實際" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:73 *************** *** 1728,1735 **** msgstr "地å€" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:118 - msgid "Associated Websites" - msgstr "相關網站" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:55 #, c-format --- 1706,1709 ---- *************** *** 1761,1765 **** #: ../../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:15 msgid "Author" msgstr "著者" --- 1735,1739 ---- #: ../../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 msgid "Author" msgstr "著者" *************** *** 1892,1896 **** msgstr "書目記錄號碼" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:9 msgid "Biblios found" msgstr "找到書目" --- 1866,1870 ---- msgstr "書目記錄號碼" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:10 msgid "Biblios found" msgstr "找到書目" *************** *** 3222,3226 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:68 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:28 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:16 msgid "ISBN" msgstr "ISBN" --- 3196,3200 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:68 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:28 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:17 msgid "ISBN" msgstr "ISBN" *************** *** 3326,3330 **** msgstr "匯入çµæžœï¼š" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:28 msgid "Import this biblio" msgstr "匯入這個書目" --- 3300,3304 ---- msgstr "匯入çµæžœï¼š" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:29 msgid "Import this biblio" msgstr "匯入這個書目" *************** *** 3753,3760 **** msgstr "連çµKohaåŠæ©Ÿè®€æ ¼å¼è³‡æ–™åº«" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:117 - msgid "Links to" - msgstr "連çµè‡³" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:140 msgid "List Item Price Includes GST" --- 3727,3730 ---- *************** *** 3967,3971 **** #, fuzzy msgid "Mark seen" ! msgstr "Mike Hansen" #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:82 --- 3937,3941 ---- #, fuzzy msgid "Mark seen" ! msgstr "最近出ç¾" #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:82 *************** *** 4363,4372 **** msgstr "éžå°èªªé¡ž" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:18 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:20 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:46 - #, fuzzy msgid "Normal" ! msgstr "æ ¼å¼" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:131 --- 4333,4342 ---- msgstr "éžå°èªªé¡ž" + # FIXME This does not seem too sound. The code looks puzzling. Need to re-check. #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:18 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:20 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:46 msgid "Normal" ! msgstr "一般" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:131 *************** *** 4434,4438 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:55 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:88 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:32 msgid "Nothing found" msgstr "什麼也找ä¸åˆ°" --- 4404,4408 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:55 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:88 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:33 msgid "Nothing found" msgstr "什麼也找ä¸åˆ°" *************** *** 5569,5573 **** msgstr "ä¸è¦é‡è¨­åˆ°æœŸæ—¥" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:35 #, c-format msgid "Still %s requests to go" --- 5539,5543 ---- msgstr "ä¸è¦é‡è¨­åˆ°æœŸæ—¥" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:36 #, c-format msgid "Still %s requests to go" *************** *** 5907,5911 **** #: ../../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:14 msgid "Title" msgstr "é¡Œå" --- 5877,5881 ---- #: ../../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 msgid "Title" msgstr "é¡Œå" *************** *** 6428,6432 **** msgstr "Z39.50伺æœå™¨ç®¡ç†" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:5 msgid "Z3950 Search Results" msgstr "Z3950查詢çµæžœ" --- 6398,6402 ---- msgstr "Z39.50伺æœå™¨ç®¡ç†" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:6 msgid "Z3950 Search Results" msgstr "Z3950查詢çµæžœ" *************** *** 6535,6541 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:69 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:17 msgid "coming from" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:29 --- 6505,6511 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:69 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:18 msgid "coming from" ! msgstr "æºè‡ª" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:29 *************** *** 6546,6552 **** #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:12 - #, fuzzy msgid "dir. de publication" ! msgstr "出版地：" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:262 --- 6516,6521 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:12 msgid "dir. de publication" ! msgstr "編輯" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:262 *************** *** 6831,6834 **** --- 6800,6804 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:7 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:7 + #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:2 msgid "text/html; charset=iso-8859-1" msgstr "text/html; charset=utf-8" *************** *** 6917,6918 **** --- 6887,7006 ---- msgid "z3950 search" msgstr "z3950查詢" + + #, fuzzy + #~ msgid "    - - Average Borrowings" + #~ msgstr "　　- - 借書讀者總數" + + #, fuzzy + #~ msgid "    - - Total Borrowings" + #~ msgstr "　　- - 借書讀者總數" + + #, fuzzy + #~ msgid "    - - Update Details" + #~ msgstr "　　- 供應商資料" + + #, fuzzy + #~ msgid "    - All Books Out" + #~ msgstr "　　- - 書藉" + + #, fuzzy + #~ msgid "    - Audit Reports" + #~ msgstr "　　- 報表" + + #, fuzzy + #~ msgid "    - Catalogue Search" + #~ msgstr "　　- å–消訂單" + + #, fuzzy + #~ msgid "    - Fundview CD" + #~ msgstr "　　- Levin" + + #, fuzzy + #~ msgid "    - History" + #~ msgstr "　　- Foxton" + + #, fuzzy + #~ msgid "    - Intranet Help" + #~ msgstr "　　- 設定" + + #, fuzzy + #~ msgid "    - Member Details" + #~ msgstr "　　- 供應商資料" + + #, fuzzy + #~ msgid "    - Messages" + #~ msgstr "　　- 移除" + + #~ msgid "    - Overdues" + #~ msgstr "　　- éŽæœŸ" + + #~ msgid "    - Renew Books" + #~ msgstr "　　- 續借" + + #~ msgid "    - Searching Help" + #~ msgstr "　　- 查詢說明" + + #~ msgid "    - Set New Budgets" + #~ msgstr "　　- 建立新é ç®—案" + + #, fuzzy + #~ msgid "    - Stocktake" + #~ msgstr "　　- 設定" + + #, fuzzy + #~ msgid "    - Telnet Help" + #~ msgstr "　　- 移除" + + #, fuzzy + #~ msgid "-> Borrower Enquiry" + #~ msgstr "讀者號碼" + + #~ msgid "-> Help" + #~ msgstr "-> 線上說明" + + #, fuzzy + #~ msgid "-> Resources" + #~ msgstr "-> 還書" + + #~ msgid "Description: %s" + #~ msgstr "說明：%s" + + #~ msgid "Title: %s" + #~ msgstr "é¡Œå：%s" + + #~ msgid "URL:http://%s" + #~ msgstr "網å€ï¼šhttp://%s" + + #~ msgid "Add to shelf" + #~ msgstr "新增至虛擬書架" + + #~ msgid "Add to virtual shelf" + #~ msgstr "新增至虛擬書架" + + #~ msgid "Add to virtual shelf : %s" + #~ msgstr "新增至虛擬書架：%s" + + #~ msgid "Associated Websites" + #~ msgstr "相關網站" + + #~ msgid "Author : %s" + #~ msgstr "著者：%s" + + #~ msgid "Links to" + #~ msgstr "連çµè‡³" + + #~ msgid "Not Reservable" + #~ msgstr "ä¸å¯é ç´„" + + #~ msgid "OTHER" + #~ msgstr "其他" + + #~ msgid "Title : %s" + #~ msgstr "é¡Œå：%s" + + #~ msgid "select" + #~ msgstr "é¸æ“‡" + + # XXX can improve + #~ msgid "you are in ISSUES & RETURNS" + #~ msgstr "你在此：借出åŠé‚„書" Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac.zh_TW 24 Feb 2004 03:21:37 -0000 1.8 --- opac.zh_TW 25 Feb 2004 08:16:34 -0000 1.9 *************** *** 7,11 **** msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-23 22:05-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" --- 7,11 ---- msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-25 03:21-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" From oleonard at users.sourceforge.net Wed Feb 25 18:28:47 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:28:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6866/koha-tmpl/intranet-tmpl/npl/en/acqui Modified Files: acqui-home.tmpl Log Message: Minor correction to HTML (closing input tags) Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acqui-home.tmpl 19 Feb 2004 18:59:36 -0000 1.1 --- acqui-home.tmpl 25 Feb 2004 17:28:43 -0000 1.2 *************** *** 27,31 **** ! --- 27,31 ---- ! *************** *** 47,52 ****
    ! ! " name="" value="">
    --- 47,52 ----
    ! ! " name="" value="" />
    From oleonard at users.sourceforge.net Wed Feb 25 18:51:16 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:51:16 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.64.2.3,1.64.2.4 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11874/circ Modified Files: Tag: rel_2_0 circulation.pl Log Message: Small changes to help fix Bug 436 Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.64.2.3 retrieving revision 1.64.2.4 diff -C2 -r1.64.2.3 -r1.64.2.4 *** circulation.pl 28 Jan 2004 21:50:17 -0000 1.64.2.3 --- circulation.pl 25 Feb 2004 17:51:09 -0000 1.64.2.4 *************** *** 88,92 **** if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "No borrower matched '$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); --- 88,92 ---- if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); *************** *** 230,233 **** --- 230,234 ---- my $tcolor = ''; my $pcolor = ''; + my $od = ''; foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){ my $dd = $book->{'date_due'}; *************** *** 235,245 **** $dd=format_date($dd); $datedue=~s/-//g; - # FIXME - Instead of declaring the font color here, can we set a variable - # that says 'overdue'? Then the template can check for it: if ($datedue < $todaysdate) { ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; --- 236,245 ---- $dd=format_date($dd); $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); + $book->{'od'}=$od; $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; *************** *** 264,274 **** $dd=format_date($dd); my $pcolor = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! # FIXME - See line 233 above regarding overdues ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ --- 264,276 ---- $dd=format_date($dd); my $pcolor = ''; + my $od = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; + $book->{'od'}=$od; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ From oleonard at users.sourceforge.net Wed Feb 25 18:53:51 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:53:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15.2.4,1.15.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12834/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: Tag: rel_2_0 circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15.2.4 retrieving revision 1.15.2.5 diff -C2 -r1.15.2.4 -r1.15.2.5 *** circulation.tmpl 23 Feb 2004 21:22:00 -0000 1.15.2.4 --- circulation.tmpl 25 Feb 2004 17:53:47 -0000 1.15.2.5 *************** *** 5,9 **** ! &printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &branch=&printer=&print=yes"> Next Borrower  *************** *** 14,21 **** !

    Circulation: Issues

    ! Branch: Printer:     Change Settings "> "> --- 14,24 ----
    !

    Circulation: Issues


    ! Branch:
    ! Printer:
    ! Change Settings "> "> +

     

    *************** *** 35,39 **** Branch:
    Printer:
    ! Change Settings"> "> --- 38,42 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 120,124 ****
    !
    /images/background-mem.gif">Messages
    --- 123,127 ---- !
    /images/background-mem.gif">Messages
    No borrower matched
    *************** *** 138,142 ****
    ! --- 141,145 ----
    ! *************** *** 169,173 ****
    ! ! ! ! ! ! ! ! ! ! ! !
    --- 172,176 ---- ! ! --- 187,191 ---- ! *************** *** 222,226 **** !
    *************** *** 184,188 **** Item Barcode:
    Item Barcode:
    ! ! --- 305,309 ---- ! From oleonard at users.sourceforge.net Wed Feb 25 19:20:15 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:20:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19245/koha-tmpl/intranet-tmpl/npl/en/circ Modified Files: circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation.tmpl 19 Feb 2004 19:02:58 -0000 1.1 --- circulation.tmpl 25 Feb 2004 18:20:05 -0000 1.2 *************** *** 55,59 ****
    ! Add a new patron
    --- 55,59 ----
    ! No patron matched Add a new patron
    From kb2qzv at users.sourceforge.net Wed Feb 25 20:49:04 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:49:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters currency.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10320/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: currency.tmpl Log Message: Added > and < instead of << >>. Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** currency.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- currency.tmpl 25 Feb 2004 19:49:01 -0000 1.9 *************** *** 192,196 **** ! << Prev --- 192,196 ---- ! << Prev *************** *** 198,202 **** ! Next >> --- 198,202 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:49:48 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:49:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters printers.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10830/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: printers.tmpl Log Message: Added > and < instead of << >>. Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** printers.tmpl 11 Feb 2004 09:02:55 -0000 1.9 --- printers.tmpl 25 Feb 2004 19:49:46 -0000 1.10 *************** *** 185,189 **** ! << Prev --- 185,189 ---- ! << Prev *************** *** 191,195 **** ! Next >> --- 191,195 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:50:26 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:50:26 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters stopwords.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10978/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: stopwords.tmpl Log Message: Added > and < instead of << >>. Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** stopwords.tmpl 9 Dec 2003 10:29:01 -0000 1.11 --- stopwords.tmpl 25 Feb 2004 19:50:23 -0000 1.12 *************** *** 157,161 **** ! << Prev --- 157,161 ---- ! << Prev *************** *** 163,167 **** ! Next >> --- 163,167 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:51:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:51:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters z3950servers.tmpl,1.12,1.13 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11158/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: z3950servers.tmpl Log Message: Added > and < instead of << >>. Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** z3950servers.tmpl 11 Feb 2004 09:02:55 -0000 1.12 --- z3950servers.tmpl 25 Feb 2004 19:51:08 -0000 1.13 *************** *** 270,274 **** ! << Prev --- 270,274 ---- ! << Prev *************** *** 276,280 **** ! Next >> --- 276,280 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:54:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:54:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue searchresults.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12161/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: searchresults.tmpl Log Message: removal of 2 quotation marks from the bgcolor= so that translator is happy. Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** searchresults.tmpl 20 Feb 2004 02:49:26 -0000 1.9 --- searchresults.tmpl 25 Feb 2004 19:54:57 -0000 1.10 *************** *** 63,67 ****     ! !
    Borrower information
    --- 225,229 ---- ! ! --- 245,249 ---- ! *************** *** 260,264 **** ! --- 263,267 ---- ! *************** *** 270,276 ****
    Borrower information
    *************** *** 242,246 ****
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    >
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    ODUESYes, See below
    ODUESYes, See below
    !
    !
    /images/background-mem.gif"> --- 273,279 ----
    !



    ! ! --- 308,312 ---- ! From oleonard at users.sourceforge.net Wed Feb 25 19:09:31 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:09:31 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.67,1.68 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17014/circ Modified Files: circulation.pl Log Message: Small changes to help fix Bug 436 Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -r1.67 -r1.68 *** circulation.pl 11 Feb 2004 08:42:02 -0000 1.67 --- circulation.pl 25 Feb 2004 18:09:29 -0000 1.68 *************** *** 88,92 **** if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "No borrower matched '$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); --- 88,92 ---- if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); *************** *** 230,233 **** --- 230,234 ---- my $tcolor = ''; my $pcolor = ''; + my $od = ''; foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){ my $dd = $book->{'date_due'}; *************** *** 235,245 **** $dd=format_date($dd); $datedue=~s/-//g; - # FIXME - Instead of declaring the font color here, can we set a variable - # that says 'overdue'? Then the template can check for it: if ($datedue < $todaysdate) { ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; --- 236,245 ---- $dd=format_date($dd); $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); + $book->{'od'}=$od; $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; *************** *** 264,274 **** $dd=format_date($dd); my $pcolor = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! # FIXME - See line 233 above regarding overdues ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ --- 264,276 ---- $dd=format_date($dd); my $pcolor = ''; + my $od = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; + $book->{'od'}=$od; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ From oleonard at users.sourceforge.net Wed Feb 25 19:15:38 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:15:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.17,1.18 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18312/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** circulation.tmpl 20 Feb 2004 02:49:26 -0000 1.17 --- circulation.tmpl 25 Feb 2004 18:15:35 -0000 1.18 *************** *** 120,124 ****
    /images/background-mem.gif"> *************** *** 305,309 ****
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    !
    /images/background-mem.gif">Messages
    --- 120,124 ---- !
    /images/background-mem.gif">Messages
    No borrower matched
    *************** *** 305,309 ****
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif"> ! !
    --- 63,67 ---- ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! ! !
    From kb2qzv at users.sourceforge.net Wed Feb 25 20:56:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:56:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12663/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: branchtransfers.tmpl Log Message: missing ; added to the end of   Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branchtransfers.tmpl 9 Dec 2003 10:29:05 -0000 1.6 --- branchtransfers.tmpl 25 Feb 2004 19:56:55 -0000 1.7 *************** *** 9,13 ****

    Circulation: Transfers


    ! Branch:   Printer:
    Change Settings --- 9,13 ----

    Circulation: Transfers


    ! Branch:   Printer:
    Change Settings From oleonard at users.sourceforge.net Wed Feb 25 21:01:56 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 12:01:56 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.14.2.2,1.14.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13887/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 MARCdetail.tmpl Log Message: Changing French string to English, cleaning up some HTML markup Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -C2 -r1.14.2.2 -r1.14.2.3 *** MARCdetail.tmpl 19 Feb 2004 10:22:46 -0000 1.14.2.2 --- MARCdetail.tmpl 25 Feb 2004 20:01:54 -0000 1.14.2.3 *************** *** 8,24 **** ! ! ! ! ! ! ! ! ! ! ! !
    ! /images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! --- 8,24 ---- !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">Print')">Add to shelf MARC biblio :
    ! /images/background-mem.gif"> *************** *** 103,114 ****
    ! ! ! ! ! ! *************** *** 27,44 **** ! ! --- 50,54 ---- ! " class="button">Request *************** *** 57,63 ****
    !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">Print')">Add to shelf MARC biblio :
    ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    --- 27,44 ----
    ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    *************** *** 50,54 **** ! class="button">Request
    ! /images/background-mem.gif"> --- 57,63 ----
    !
    ! /images/background-mem.gif"> *************** *** 74,80 ****
    ! /images/background-mem.gif"> --- 74,80 ----
    ! /images/background-mem.gif"> *************** *** 91,97 ****
    ! /images/background-mem.gif"> --- 91,97 ----
    ! /images/background-mem.gif"> *************** *** 108,114 ****
    ! /images/background-mem.gif"> --- 108,114 ----
    ! /images/background-mem.gif"> *************** *** 125,131 ****
    ! /images/background-mem.gif"> --- 125,131 ----
    ! /images/background-mem.gif"> *************** *** 142,148 ****
    ! /images/background-mem.gif"> --- 142,148 ----
    ! /images/background-mem.gif"> *************** *** 159,165 ****
    ! /images/background-mem.gif"> --- 159,165 ----
    ! /images/background-mem.gif"> *************** *** 176,182 ****
    ! /images/background-mem.gif"> --- 176,182 ----
    ! /images/background-mem.gif"> *************** *** 193,199 ****
    ! /images/background-mem.gif"> --- 193,199 ----
    ! /images/background-mem.gif"> *************** *** 210,216 ****
    ! /images/background-mem.gif"> --- 210,216 ----
    ! /images/background-mem.gif"> *************** *** 227,231 ****
    /images/background-mem.gif"> --- 227,231 ----
    /images/background-mem.gif"> *************** *** 239,243 **** !

    Modify category

    Dodaj kategoriÄ™

    name=Aform method=post>
    Kod Kategorii >
    Kod Kategorii
    WyjaÅ›nienie  
    Enrollment period
    Górna granica wieku
    Wymagany Wiek
    Enrollment fee
    Overdue notice required
    Issue limit
    Reserve fee
     
    Data recorded
    method=post>
    TOTAL : :
    > Data deleted

    Kategoria admin

    Szukano >
    Kod Kategorii
    Wyjaśnienie
    Enrollment period
    Górna granica wieku
    Wymagany Wiek
    Fine type
    Enrollment fee
    Overdue notice required TakNie
    Issue limit
    Reserve fee
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA
    Kategoria Wyjaśnienie Enrollment period Enrollment fee Górna Granica Wieku Wymagany Wiek Fine Overdue Issue limit Reserve
    Tak Nie /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:31 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members member-password.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6558/members Added Files: Tag: rel_2_0 member-password.tmpl Log Message: translation update --- NEW FILE --- Click here to continue to see Member Info.

    ,

    > You have entered a UserID that already exists. Please choose another one.
    New UserID: >
    New Password: >

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:31 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6558/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: translation update --- NEW FILE ---
    WIERSZ OPISU



    Wydana przez : w , ,
    Kolekcja:
    Przedmiot:
    Rok :
    Uwagi:
    Tytuł Ujednolicony:
    Dewey: ">
    Klasyfikacja:
    LCCN:
    URL: ">
    ISBN:
    ,
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters categoryitem.tmpl,NONE,1.1.2.1 charges.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6713/parameters Added Files: Tag: rel_2_0 categoryitem.tmpl charges.tmpl checkmarc.tmpl Log Message: translation update --- NEW FILE ---

    Modify category

    Dodaj kategoriÄ™

    name=Aform method=post>
    Kod Kategorii >
    Kod Kategorii
    WyjaÅ›nienie >  
    Enrolment period >
    Górna granica wieku >
    Wymagany Wiek >
    Fine type >
    Bulk >
    Enrolment fee >
    Overdue notice required >
    Issue limit >
    Reserve fee >
     
    Data recorded method=post>
    TOTAL : :
    > Data deleted

    Kategoria admin

    Szukano >
    Kod Kategorii
    Wyjaśnienie
    Enrolment period
    Górna granica wieku
    Wymagany Wiek
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA
    Kategoria Wyjaśnienie Enrolment Górna Granica Wieku Wymagany Wiek Fine Bulk Opłata Overdue Issue limit Reserve
    Edytuj Wymaż


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    Test Result
    itemnum
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    OK itemnum : the field itemnumber is mapped to a field in tab -1
    item fields ALL items fields MUST :
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    OK Wszystkie pola pozycji są w tym samym znaczniku i w zakładce pozycji
    itemtypes table empty the itemtypes table is empty. It must contain at least 1 value
    OK itemtypes table filled with at least 1 value
    itemtype NOT mapped the biblioitems.itemtype field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised_value=itemtype
    		•
    OK biblioitems.itemtype defined
    branch table empty the branch table is empty. It must contain at least 1 value !
    OK branch table filled with at least 1 value
    homebranch NOT mapped the items.homebranch field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised value=branches
    		•
    OK homebranch defined
    holdingbranch NOT mapped the items.holdingbranch field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised value=branches
    		•
    OK holdingbranch defined
    biblio and biblionumber The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    OK biblionumber and biblioitemnumber mapped correctly
    TOTAL You have error(s) in your MARC configuration. Please fix them before using koha
      Configuration OK, you don't have errors in your MARC parameters table
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:34:42 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:34:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters currency.tmpl,NONE,1.1.2.1 itemtypes.tmpl,NONE,1.1.2.1 printers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6942/parameters Added Files: Tag: rel_2_0 currency.tmpl itemtypes.tmpl printers.tmpl Log Message: translation update --- NEW FILE ---

    Modify currency

    Dodaj walutÄ™

    Currency
    Currency
    Rate
    Data recorded
    Currency
    Rate
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Currencies admin

    >
    You searched for
    Currency Rate
    Edytuj Wymaż
    << Wstecz        Dalej >>

    --- NEW FILE ---

    Modify item type

    Dodaj typ pozycji

    Typ pozycji>
    Typ pozycji
    WyjaÅ›nienie  
    Not for loan if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item
    Okres wypożyczenia meaningful only if not for loan is not set
    Wolno Przedłużać checked value=1>
    Opłata wynajmu
     
    Typ pozycji
    Wyjaśnienie
    Okres wypożyczenia
    PrzedłużeniaMożliweNot allowed
    Opłata wynajmu
    Ten rekord był w użyciu razy. Wymazanie nie jest możliwe
    POTWIERDZENIE WYMAZANIA

    Typ Pozycji Admin

    Kod Wyjaśnienie Okres wypożyczenia Renewable Opłata Edytuj Wymaż
    TakNie ?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>

    //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> //images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    --- NEW FILE ---

    Modify printer

    Dodaj drukarkÄ™

    Nazwa Drukarki
    Nazwa Drukarki
    Queue
    Typ
    Data recorded
    Drukarka
    Queue
    Typ
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Drukarka Admin (fixme)

    >
    You searched for
    ImiÄ™ i Nazwisko Queue Typ
    Edytuj Wymaż
    << Wstecz        Dalej >>

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:35:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:35:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/reports inventory.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7124/reports Added Files: Tag: rel_2_0 inventory.tmpl Log Message: --- NEW FILE ---

    Inventory/Stocktaking

    Select items you want to check
    Item Location (items.bulk) between "> and ">
    not seen since ">
    show "> items beginning at offset ">
    "> "> "> "> ">
    Seen Kod Paskowy Bulk Tytuł Autor
    " value="1">
    "> "> "> "> ">
    "> "> "> "> ">
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:35:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:35:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters stopwords.tmpl,NONE,1.1.2.1 z3950servers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7124/parameters Added Files: Tag: rel_2_0 stopwords.tmpl z3950servers.tmpl Log Message: --- NEW FILE ---

    Modify word

    Dodaj słowo

    SÅ‚owo
    SÅ‚owo
    Data recorded
    SÅ‚owo
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Stop words admin

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    You searched for
    SÅ‚owo
    Wymaż
    << Wstecz        Dalej >>

    --- NEW FILE ---

    Modify Z39.50 Server

    Dodaj Serwer Z39.50

    Z39.50 Server
    Z39.50 Server
    Hostname
    Port
    Database
    Użytkownik
    Password
    Checked (searched by default)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    Data recorded
    >
    Site
    Hostname
    Port
    Database
    Użytkownik
    Password
    Checked
    Rank
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Z39.50 Servers admin

    >
    You searched for
    Site Hostname Port Database Użytkownik Password Checked Rank Syntax
    //images/fileopen.png" alt="Edytuj" title="edit" border=0> //images/edittrash.png" alt="Wymaż" title="delete" border=0>
    << Wstecz        Dalej >>

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:37:21 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:37:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/search.marc result.tmpl,NONE,1.1.2.1 search.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7488/search.marc Added Files: Tag: rel_2_0 result.tmpl search.tmpl Log Message: --- NEW FILE --- Wyniki szukania MARC
    &=&resultsperpage=&type=intranet&op=do_search> &=&resultsperpage=&type=intranet&op=do_search> &=&&resultsperpage=&type=intranet&op=do_search>
     WyÅ›wietlono od do z

      Nic nie znaleziono.
    Opis # Autor Tytuł
    ">
    &=&resultsperpage=&type=intranet&op=do_search> &=&resultsperpage=&type=intranet&op=do_search> &=&&resultsperpage=&type=intranet&op=do_search>
    --- NEW FILE --- Szukanie MARC
    ">
    		POMOC :
    Zbuduj kwerendę stosując pola i podpola MARC. "Dodaj kryteria " pozwala na dodanie innych kryteriów wyszukiwania. "Szukaj" przesyła kwerendę i wyświetla wyniki.
      value="">

    Liczba wyświetleń na stronę:
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:37:55 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:37:55 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/value_builder unimarc_field_105.tmpl,NONE,1.1.2.1 unimarc_field_60X.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7583/value_builder Added Files: Tag: rel_2_0 unimarc_field_105.tmpl unimarc_field_60X.tmpl Log Message: --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Année début ">
    Année fin ">
    --- NEW FILE --- Szukaj w tezaurusie

    Search

    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
    "> "> ">

    Wyniki

    &level=&search_string="> ')">

    Dependancies

    &level=&search_string=+"> ')">

    Dodawanie

    "> "> Create a new authority/thesaurus entry : ">
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:38:27 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:38:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/z3950 searchresult.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7705/z3950 Added Files: Tag: rel_2_0 searchresult.tmpl Log Message: --- NEW FILE --- "> Wyniki Szukania Z3950
    Znalezione Opisy
    ">
    TytuÅ‚ Autor ISBN coming from    
    )">Import this biblio
    Nothing found

    Still requests to go


    From kb2qzv at users.sourceforge.net Sun Feb 29 20:39:53 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:39:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui acqui-home.tmpl,1.1,1.1.2.1 acquire.tmpl,1.1,1.1.2.1 basket.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8009/acqui Modified Files: Tag: rel_2_0 acqui-home.tmpl acquire.tmpl basket.tmpl Log Message: Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acqui-home.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** acqui-home.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- acqui-home.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Akwizycje


    ! --- 69,98 ----
    ! SK£ADANIE ZAMÓWIENIA, ODBIÓR LUB MODYFIKACJA
    Nazwa dostawcy
    --- 1,14 ---- ! !

    Gromadzenie


    ! ! ! ! ! ! --- 41,56 ---- ! ! ! *************** *** 63,67 **** ! --- 63,67 ---- ! *************** *** 69,97 ****
    ! START, RECEIVE, MODIFY ANY ORDER
    Supplier Name *************** *** 21,29 ****
    ! ODBIÓR LUB MODYFIKACJA ZAMÓWIEÑ REGULARNYCH
    Wyszukiwanie tytu³owe --- 21,29 ----
    ! RECEIVE OR MODIFY PERIODICAL ORDER
    Szukaj wg. Tytułu *************** *** 41,56 ****
    KURSY WYMIANY
    ! ! " value=>
    EXCHANGE RATES
    ! ! " value=>
    BUD¯ET ORAZ WYDATKI KSIÊGARSKIE
    BUDGET I FUNDUSZE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Bud¿etSumaWydanoAlokowanoDostêpne
    Total

    ! Zastosuj kombinacjê klawiszy [ctrl + r] aby wy¶wietliæ uaktualnione cyfry. ! Podane cyfry s± przybli¿one, gdy¿ kurs wymiany wp³ywa na kwotê faktycznie zap³acon±.
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Budgets TotalSpentComtdAvail
    Total
    !

    ! Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid. !

    !

    POMOC zamówienia:

    !
      By rozpocz±æ akwizycjê, niezale¿nie czy jest to zamówienie, zakup w³asny czy darowizna najpierw wyszukaj dostawcê, dodaj go je¶li potrzeba.
    !
      Nastêpnie wybierz poprzedni koszyk lub utwórz nowy. Uwaga, koszyk bêdzie nale¿a³ do nazwy u¿ytkownika z jak± siê zalogowa³e¶/a¶.
    !
      Aby z³ozyæ zamówienie nale¿y ustaliæ czy istnieje ju¿ opis dla pozycji, nastêpnie albo dodaæ pozycjê albo wstawiæ nowy opis i dodaæ pozycjê.
    !

    W celu zamkniêcia koszyka kliknij na "zobacz koszyki" lub szukaj powy¿ej, a nastêpnie naci¶nij "zatwierd¼ koszyk".

    !
    ! --- 104,115 ----
    !

    HELP Ordering:

    !
      To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.
    !
      Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to
    !
      To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.
    !

    To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".

    !
    ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acquire.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** acquire.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- acquire.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,14 **** !
    ! Rachunek:
    ! Otrzymany przez:
    !
    !

    Receipt Summary for: Invoice,

    ! !

    - Odbiór zamówienia


    ! Koszyk dla: !
    Zamówienie z³o¿one:

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 25,91 ---- !

    - Przyjmij Zamówienie


    ! Shopping Basket For: !
    Order placed:

    /images/background-mem.gif" colspan=2> ! SZCZEGÓ£Y KATALOGU
    Tytu³ *" >
    Autor" >
    Data Copyright" >
    Format
    ISBN">
    Series">
    Oddzia³
    Kod kreskowy pozycji *">
    Informacje tomowe (for serials) *
    ! > ! > ! > ! "> ! "> ! "> ! ! /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> ! ! &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 93,134 ****
    /images/background-mem.gif" colspan=2> ! SZCZEGÓÅY KATALOGU
    Tytuł*" >
    Autor" >
    Copyright Date" >
    Format
    ISBN">
    Series">
    Oddział
    Item Barcode *">
    Oznaczenie tomowe (dla serii) *
    ! > ! > ! > ! "> ! "> ! "> ! ! ! ! &id=>Edytuj !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DETALE KSIÊGOWO-FINANSOWE
    Bookfund *
    Ilo¶æ zamówiona">
    Ilo¶æ odebrana *">
    Koszt wymiany">
    Budgeted Cost ">
    Faktyczny koszt *">
    Numer rachunku ! ! ">
    Uwagi">
    --- 93,134 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEGÓÅY RACHUNKU
    Bookfund *
    Quantity Ordered">
    Quantity Received *">
    Replacement Cost">
    Koszta zaplanowane ">
    Faktyczny Koszt*">
    Invoice Number ! ! ">
    Uwagi">
    *************** *** 137,141 ****

     

    !
    --- 137,141 ----

     

    !
    *************** *** 144,162 ****
    		Koszyk ISBNTYTU£ AUTORIlo¶æOtrzymano
    &biblio=&invoice=&freight=&gst=&id=>
    ! --- 144,162 ----     		Koszyk ISBNTYTUÅ AUTORQtyReceived
    &biblio=&invoice=&freight=&gst=&id=>
    ! Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/basket.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** basket.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- basket.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,55 **** ! !

    Koszyk dla >


    ! (Our Reference: , #, zatwierdzone przez: )

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! --- 1,57 ---- ! !

    Koszyk Zakupów dla >


    ! Our Reference: , # authorised by

    Zamówienie IsbnTytu³ Autor$ rrp$estIlo¶æSuma
    &id=&basket=">
    POMOC
    ! W celu zmiany informacji dotycz±cej katalogu lub zaksiêgowania danego zamówienia nalezy klikn±æ w tytu³.
    		 SubTotal
    GST
    TOTAL
    ! "> ! "> ! Dodaj zamówienie : wprowad¼ has³o lub tytu³:
    ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! *************** *** 59,61 **** ! --- 61,63 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:08 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui newbasket2.tmpl,1.2,1.2.2.1 newbasket.tmpl,1.1,1.1.2.1 newbiblio.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8103/acqui Modified Files: Tag: rel_2_0 newbasket2.tmpl newbasket.tmpl newbiblio.tmpl Log Message: Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket2.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newbasket2.tmpl 4 Oct 2003 19:47:09 -0000 1.2 --- newbasket2.tmpl 29 Feb 2004 19:40:06 -0000 1.2.2.1 *************** *** 1,20 **** ! !

    Koszyk dla:

    ! ! &basket=&sub="> ! Dodaj nowy opis ! ! &basket=&sub="> ! Dodaj nowy opis ! ! "> ! Obejrzyj koszyk
    ! > ! > ! Szukaj od nowa:
    --- 1,20 ---- ! !

    Koszyk Zakupów dla:

    ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Obejrzyj Koszyk">
    ! > ! > ! New Search:
    *************** *** 23,100 **** Szukano ! ! !
    ! znalezionych trafieñ. !
    Trafienia od do wy¶wietlone. !
    Order Publisher IsbnTytuł Autor$ rrp$estQty Total
    &id=&basket=">
    POMOC
    ! To change any of the catalogue or accounting information attached to an order, click on the title.
    		 SubTotal
    GST
    TOTAL
    ! "> ! "> ! Dodaj zamówienie: wprowadź hasło lub tytuł:
    "> ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TYTU£AUTOR©ILO¦ÆLOKALIZACJA
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! ! ! &type="> ! ! ! ! ! ! ! ! !
    !   ! !   ! !   ! !   ! !   !
    ! ! &offset=&type=&id=&basket=&search=&author="> Dalej !

    ! --- 23,100 ---- Szukano ! ! !
    ! znalezionych rekordów. !
    Wyświetlono od do rekordu. ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TYTUÅAUTOR©ILOŚĆLOCATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! ! ! &type="> ! ! ! ! ! ! ! ! !
    !   ! !   ! !   ! !   ! !   !
    ! ! &offset=&type=&id=&basket=&search=&author="> Dalej ! ! Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** newbasket.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- newbasket.tmpl 29 Feb 2004 19:40:06 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Koszyk dla


    ! (Our Reference: , #, zatwierdzone przez: )
    ! Tel: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Wyszukaj has³o lub tytu³:
    --- 1,14 ---- ! !

    Koszyk Zakupów dla


    ! (Our Reference: , #, authorised by: )
    ! Ph: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Szukaj wg. Słowa Kluczowego lub Tytułu:
    *************** *** 16,36 **** ! ! ! ! ! > ! ! ! ! ! !
    Zamówienie IsbnTytu³ AutorIlo¶æ
    ! --- 16,36 ---- ! ! ! ! ! > ! ! ! ! ! !
    Order IsbnTytuł AutorQty
    ! Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbiblio.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** newbiblio.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- newbiblio.tmpl 29 Feb 2004 19:40:06 -0000 1.1.2.1 *************** *** 1,3 **** !
    ! ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Obejrzyj koszyk !

    - Szczegó³y zamówienia


    ! Koszyk dla:

    ! ! ! ! ! ! ! ! ! ! ! !
    SZCZEGÓ£Y KATALOGU
    TYTU£ *">
    Autor" >
    Data Copyright">
    Format
    ISBN">
    Series">
    Oddzia³
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! --- 51,137 ---- ! ! --> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Przejrzyj Koszyk

    - Szczegóły Zamówienia


    ! Shopping Basket For:

    DETALE KSIÊGOWO-FINANSOWE
    Ilo¶æ" onchange='update(this.form)' >
    Bookfund
    Cena dostawcy" onchange='update(this.form)'>
    Koszt wymiany
    		" onchange='update(this.form)'>
    Budgeted Cost
    (ex GST, inc discount)     		" onchange='update(this.form)'>
    Budgeted GST
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEGÓÅY KATALOGU
    Tytuł*">
    Autor" >
    Publisher" >
    Copyright Date">
    Typ pozycji
    ISBN">
    Series">
    Oddział
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! *************** *** 138,153 **** ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEGÓÅY RACHUNKU
    Quantity" onchange='update(this.form)' >
    Bookfund
    Suppliers List Price" onchange='update(this.form)'>
    Replacement Cost
    		" onchange='update(this.form)'>
    Koszta zaplanowane
    (bez VAT, z rabatem)     		" onchange='update(this.form)'>
    Zaplanowany VAT
    Koszt faktyczny
    Numer rachunku *
    Uwagi">
    //images/2rightarrow.png" border=0 align=right>
    --- 141,157 ----
    Faktyczny Koszt
    Invoice Number *
    Uwagi">
    !
    *************** *** 155,166 **** !
    HELP
      !
    • T³uste pola s± obowiazkowe dla stworzenia nowego opisu i pozycji.

      !

    • Zacienione pola mog± byæ u¿yte w celu "szybkiego" odbioru zamówienia, gdy pozycje by³y kupione lokalnie lub darowane. W tym wypadku ilo¶æ "zamówiona" zostanie wprowadzona do bazy jako ilo¶æ otrzymana.

     

    ! --- 159,170 ---- !
    /images/background-mem.gif">POMOC
      !
    • TÅ‚uste pola muszÄ… być wypeÅ‚nione, aby utworzyć nowy opis i egzemplarz.

      !

    • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.

     

    ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui order.tmpl,1.1,1.1.2.1 recieveorder.tmpl,1.1,1.1.2.1 recieve.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8161/acqui Modified Files: Tag: rel_2_0 order.tmpl recieveorder.tmpl recieve.tmpl Log Message: Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/order.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** order.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- order.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,18 **** ! !

    Wyniki wyszukiwania dostawców


    ! Szukano dostawcy , znaleziono rezultat(y)(ów)

    ! ! ! ! ! > ! !
    ZamówOdbierzPodmiot ! ! !
    KoszykPozycjePracownikData
    --- 1,18 ---- ! !

    Wyniki Szukania Dostawców


    ! You searched on supplier , results found

    ! ! ! ! ! > ! !
    OrderReceiveCompany ! ! !
    KoszykItemsStaffDate
    *************** *** 20,48 ****
    ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > ! ! ! ! !
    ">


    ! Dodaj dostawcê ! --- 20,52 ----
    ! ! /images/mail_send.png" title="Dodaj zamówienie" alt="Dodaj" border=0> ! ! Inactive ! ! /images/mail_get.png" title="receive" alt="Dodaj" border=0> ! ! ! ! !
    ">


    ! Dodaj dostawcÄ™ ! Index: recieveorder.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieveorder.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** recieveorder.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- recieveorder.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Odbiór zamówieñ od dostawcy ">

    ! >

    ! ! --- 1,14 ---- ! !

    Przyjmij Zamówienia od Dostawcy ">

    ! >

    INFORMACJE O RACHUNKU DOSTAWCY
    Numer rachunku dostawcy
    ! ! *************** *** 20,29 **** ! ! --- 20,29 ---- ! ! *************** *** 31,33 **** ! --- 31,33 ---- ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieve.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** recieve.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- recieve.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,19 **** !
    ! Rachunek:
    ! Otrzymany przez:
    !
    !

    Receipt Summary for : , Rachunek

    ! "> ! "> ! "> ! "> ! Szukaj ISBN lub tytu³:

    --- 1,19 ---- !

    ! Invoice:
    ! Received By:
    !
    !

    Receipt Summary for : Faktura

    ! "> ! "> ! "> ! "> ! Szukaj wg. ISBN lub Tytułu:

    *************** *** 24,47 ****

    ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! --- 53,60 ---- ! ! ! ! *************** *** 63,74 ****
    The total at the bottom of the page should be within a few cents of the total for the invoice.

    ! When you have finished this invoice save the changes.

    ! !
    SUPPLIER INVOICE INFORMATION
    Supplier Invoice Number
    Za przesy³kê
    /images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
    Freight
    KOSZYK ISBNTYTU£ AUTORFAKTYCZNY P&PILSUMA
    &biblio=&invoice=&gst=&freight=&id=">$ $
    --- 24,47 ----     		KOSZYK ISBNTYTUÅ AUTORACTUAL P&PQTYTOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    *************** *** 53,60 ****     		SUBTOTALS$$
    SUBTOTALS$$
    GST$
    TOTAL$
    --- 63,74 ----
    The total at the bottom of the page should be within a few cents of the total for the invoice.

    ! Po skończeniu faktury zapisz zmiany.

    		GST$
    TOTAL$
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:43 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui supplier.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8230/acqui Modified Files: Tag: rel_2_0 supplier.tmpl Log Message: Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/supplier.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** supplier.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- supplier.tmpl 29 Feb 2004 19:40:41 -0000 1.1.2.1 *************** *** 1,13 **** !
    ! > ! !

    Uaktualnienie:

    ! !

    Dodaj dostawcê

    !

    --- 1,13 ---- ! ! > ! !

    Update:

    ! !

    Dodaj dostawcÄ™

    !

    *************** *** 15,108 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - - -
    Szczegó³y podmiotu
    Nazwa podmiotu">
    Adres pocztowy !
    Adres fizyczny
    Telefon">
    Fax">
    Witryna">
    Dane kontaktowe
    Nazwisko">
    Stanowisko">
    Telefon">
    Inny telefon">
    Fax">
    E-mail">
    Uwagi
    /images/filesave.png" border=0 title="save" alt="save">
    ! ! ! ! ! --- 15,109 ----
    BIE¯¡CY STATUS
    Dostawca jestchecked>Active ! checked>Inactive
    DANE O ZAMÓWIENIACH
    Publishers and Imprints
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DANE O FIRMIE
    Company Name">
    Adres Pocztowy !
    Adres Zamieszkania
    Telefon">
    Fax">
    Witryna">
    DANE KONTAKTOWE
    Contact Name">
    Position">
    Telefon">
    Inny Telefon">
    Fax">
    E-mail">
    Uwagi
    ! ! ! ! ! Active Inactive ! ! ! *************** *** 111,117 **** --- 112,118 ---- *************** *** 121,127 **** --- 122,128 ---- *************** *** 130,135 **** --- 131,135 ---- *************** *** 137,142 **** --- 137,141 ---- *************** *** 144,160 **** ! !
    STATUS BIEŻĄCY
    Supplier is ! ! Active Inactive
    ORDERING INFORMATION
    Publishers and Imprints
    GST Registered ! checked>Yes ! checked>No
    GST Registered ! checked>Tak checked>Nie
    List Item Price Includes GST ! checked>Yes ! checked>No
    List Item Price Includes GST ! checked>Tak checked>Nie
    Invoice Item Price Includes GST ! checked>Yes ! checked>No
    Rabat> %
    !

    ! --- 143,159 ----
    		Invoice Item Price Includes GST ! checked>Tak checked>Nie
    Discount> %
    !
    !
    /images/filesave.png" border=0 title="Zapisz" alt="Zapisz" class="button"> ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple addbooks.tmpl,1.3,1.3.2.1 additem-nomarc.tmpl,1.1,1.1.2.1 additem.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8284/acqui.simple Modified Files: Tag: rel_2_0 addbooks.tmpl additem-nomarc.tmpl additem.tmpl Log Message: Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/addbooks.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** addbooks.tmpl 4 Oct 2003 20:45:12 -0000 1.3 --- addbooks.tmpl 29 Feb 2004 19:40:55 -0000 1.3.2.1 *************** *** 1,39 **** ! ! Zarz±dzanie opisem MARC !

    ! Nic nie znaleziono ! !

    ! Dodano opis bibliograficzny witryny !

    !
    Zeskanuj lub wpisz numer ISBN/ISSN, aby dodaæ nowy opis/pozycjê:

    ! ! ! ! ! ! ! ! ! ! ! ! !
    ISBN:Je¶li tytu³ lub ISBN zostanie odnaleziony w tablicach opisów, zostanie przywo³any i bêdzie mo¿na go modyfikowaæ.
    ! Je¶li tytu³ lub ISBN zostanie znaleziony w "przechowalni opisów", zostanie przywo³any a opis zostanie dodany.
    ! W przeciwnym razie opis mo¿na utworzyæ od podstaw.
    Tytu³
     Utwórz pusty opis
    Utwórz pusty opis
    --- 1,39 ---- ! ! ZarzÄ…dzanie Opisem MARC !

    ! No items found ! !

    ! Dodano WitrynÄ™ Biblioitem !

    !
    Zeskanuj lub wpisz numer ISBN/ISSN aby dodać nowy opis/egzemplarz

    ! ! ! ! ! ! ! ! ! ! ! ! !
    ISBN:Po odnalezieniu i wyświetleniu numeru ISBN lub tytułu z bazy opisów, bedzie można dokonać modyfikacji.
    ! Jeśli ISBN lub tytuł zostaną odnalezione w rezerwuarze opisów to zostanie on wyswietlony i opis zostanie dodany.
    ! W przeciwnym razie, opis można dodać od podstaw.
    Tytuł
     Wprowadź od podstaw
    Wprowadź od podstaw
    *************** *** 44,48 **** !
    Dodaj now± witrynê
    --- 44,48 ---- !
    Dodaj NowÄ… WitrynÄ™
    *************** *** 50,59 **** ! !
    Has³o:

    ! --- 50,59 ---- ! !
    Keyword:

    ! Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem-nomarc.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** additem-nomarc.tmpl 5 Oct 2003 19:20:42 -0000 1.1 --- additem-nomarc.tmpl 29 Feb 2004 19:40:55 -0000 1.1.2.1 *************** *** 1,64 **** ! test !

    ! ! Musisz nadaæ pozycji kod kreskowy

    ! ! ! Musisz otworzyæ now± grupê, do której dodana zostanie pozycja

    ! ! ! Niestety, ten kod jest ju¿ w u¿yciu

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    REKORD BIBLIOGRAFICZNY
    Autor:
    ! Copyright:
    ! Tytu³ serii:
    ! Uwagi:
    GRUPA - !
    URL:
    ! Data:
    ! Uwagi:
    ! ! GRUPA -
    ISBN:
    ! Dewey:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    Pozycja:
    ! Odzia³ w³asny:
    ! Uwagi:
    --- 1,62 ---- ! test !

    ! ! You must give the item a barcode

    ! ! ! You must create a new group for your item to be ! added to

    ! ! ! Sorry, that barcode is already in use

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    WIERSZ OPISU
    Autor:
    ! Copyright:
    ! Tytuł Serii:
    ! Uwagi:
    GRUPA -
    URL:
    ! Data:
    ! Uwagi:
    GRUPA -
    ISBN:
    ! Dewey:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    Egzemplarz:
    ! Oddział Właściwy:
    ! Uwagi:
    *************** *** 67,90 ****

    ! "> ! ! ! ! --- 65,88 ---- ! ">
    DODAJ NOW¡ POZYCJÊ:
    ! Dla witryny dodaj tylko grupê
    Kod kreskowy pozycji:
    Oddzia³:
    Cena wymiany:
    ! ! ! ! *************** *** 94,126 **** ! ! ! ! --- 92,123 ---- ! ! ! ! *************** *** 130,150 **** ! ! ! ! ! --- 127,147 ---- ! ! ! ! ! *************** *** 154,158 **** ! --- 151,155 ---- ! *************** *** 171,175 **** ! --- 168,172 ---- ! *************** *** 178,194 **** ! ! ! ! --- 175,191 ---- ! ! ! ! *************** *** 198,203 **** !
    DODAJ NOWY EGZEMPLARZ:
    ! For a website add the group only
    Kod paskowy pozycji:
    Oddział:
    Cana Wymiany:
    Dodaj do istniej±cej grupy:
    Grupa:
    LUB dodaj do nowej grupy:
    Format:
    Dodaj do istniejÄ…cej grupy:
    Group:
    LUB Dodaj do nowej Grupy:
    Format:
    Wydawca:
    Rok publikacji:
    Miejsce publikacji:
    Ilustrator:
    Dodatkowi autorzy:
    Ka¿dy autor w osobnej linii
    Publisher:
    Publication Year:
    Place of Publication:
    Illustrator:
    Dodatkowi Autorzy:
    One Author per line
    Witryna URL:
    URL Witryny
    LCCN:
    LCCN:
    Numer:
    Volume Description:
    Strony:
    Wymiary:
    Number:
    Opis Tomu:
    Pages:
    Size:
    --- 195,199 ----
    *************** *** 205,207 **** ! --- 201,203 ---- ! Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** additem.tmpl 4 Oct 2003 20:45:12 -0000 1.2 --- additem.tmpl 29 Feb 2004 19:40:55 -0000 1.2.2.1 *************** *** 1,3 **** ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,129 ---- ! ! ! ! ZAPRASZAMY DO ADMINISTRACJI SYSTEMU ! ! ! ! ! ! ! !
    !
    ! Koha: Horowhenua Library Trust    		 ! !
    !
    ! Wprowad¼ wyra¿enie i naci¶nij klawisz enter.
    ! ! ! -Wyszukiwanie zaawansowane (wiêcej opcji)
    !
    !
    ! !
    ! !
    ! Wprowad¼ wyra¿enie i naci¶nij kalwisz enter.
    !

    !
    ! ! ! ! --- 7,11 ---- ! *************** *** 13,19 **** --- 13,19 ---- *************** *** 21,60 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 152,187 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 131,159 ---- ! ! ! ! ! ! ! ! ! + + + + ! ! ! ! *************** *** 190,194 ****
    /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
    /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Szukaj w katalogu" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
    ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">    		   ! ! !
    ! Wpisz szukane słowo i naciśnij klawisz enter.
    ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Szukanie Zaawansowane (Więcej Opcji)
    ! ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
      ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Wyszukiwanie Czytelników" name="member" hspace="0" vspace="0" border="0">
      
    ! !
    ! Wpisz szukane słowo i naciśnij klawisz enter.
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
         /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Gromadzenie" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >

    !

    !
         /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Rachunki i Raporty" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Parametry" border="0">
    + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
      /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Cyrkulacja" hspace="0" vspace="0" border="0">
    - --- 162,165 ---- Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/mancredit.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** mancredit.tmpl 4 Oct 2003 09:21:00 -0000 1.3 --- mancredit.tmpl 29 Feb 2004 19:46:59 -0000 1.3.2.1 *************** *** 1,22 **** ! !

    Kredyt rêczny

    ! "> ! ! ! ! !
    Numer czytelnika
    Typ
    Numer pozycji
    Opis
    Ilo¶æ
    ! --- 1,22 ---- ! !

    Manual Credit

    ! "> ! ! ! ! !
    Borrowernumber
    Typ
    Itemnumber
    Wyjaśnienie
    Kwota
    ! \ No newline at end of file Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/maninvoice.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** maninvoice.tmpl 4 Oct 2003 09:21:00 -0000 1.2 --- maninvoice.tmpl 29 Feb 2004 19:46:59 -0000 1.2.2.1 *************** *** 1,25 **** ! !

    Rachunek rêczny

    ! "> ! ! ! !
    Numer czytelnika
    Typ
    Numer pozycji
    Opis
    Kwota
    ! \ No newline at end of file --- 1,25 ---- ! !

    Manual Invoice

    ! "> ! ! ! !
    Borrowernumber
    Typ
    Itemnumber
    Wyjaśnienie
    Kwota
    ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:14 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl member-flags.tmpl,1.1,1.1.2.1 modbibitem.tmpl,1.3,1.3.2.1 modbib.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9875 Modified Files: Tag: rel_2_0 member-flags.tmpl modbibitem.tmpl modbib.tmpl Log Message: Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/member-flags.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** member-flags.tmpl 4 Oct 2003 09:25:44 -0000 1.1 --- member-flags.tmpl 29 Feb 2004 19:47:11 -0000 1.1.2.1 *************** *** 1,28 **** ! !

    ,

    ! > ! !
    FLAGI
    ! > ! !

    !

    ! --- 1,28 ---- ! !

    ,

    ! > ! !
    FLAGI
    ! > ! !

    !

    ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbibitem.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** modbibitem.tmpl 4 Oct 2003 09:52:36 -0000 1.3 --- modbibitem.tmpl 29 Feb 2004 19:47:11 -0000 1.3.2.1 *************** *** 1,5 **** ! !

    "&type=intra> ()
    ! Modyfikuj Grupê -


    --- 1,5 ---- ! !

    "&type=intra> ()
    ! Modify Group -


    *************** *** 7,11 ****
    PRZYPISZ DO ISTNIEJ¡CEJ GRUPY
    RE-ASSIGN TO EXISTING GROUP
    LUB ZMIEÑ SZCZEGÓ£Y
    Typ pozycji" size=20>
    URL" size="20">
    Klasa" size=20>
    Wydawca" size=20>
    Miejsce" size=20>
    ISBN" size=20>
    Rok publikacji" size=20>
    Strony" size=20>
    Ilustracje" size=20>
    Tom" size=20>
    Notatki">
    Wymiary" size=20>
    --- 21,60 ----
    LUB EDYTUJ SZCZEGÓÅY
    Typ pozycji" size=20>
    URL" size="20">
    Typ pozycji" size=20>
    Publisher" size=20>
    Place" size=20>
    ISBN" size=20>
    Publication Year" size=20>
    Pages" size=20>
    Illustrations" size=20>
    Tom" size=20>
    Uwagi">
    Size" size=20>
    *************** *** 68,92 ****
    ZMIANY MAJ¡CE DOTYCZYÆ TYCH KODÓW KRESKOWYCH
    ! Zaznacz TE kody kreskowe, których zmiany maj± dotyczyæ. Wszystkie nie-zaznaczone zachowaj± swoj± oryginaln± grupê.
     Kod kreskowyLokalizacjaTermin zwrotuOdprawiono
    ">"&bib=""&bi=""">

    --- 68,92 ---- ! ZMIANY DOTYCZĄCE TYCH KODÓW
    ! Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.   ! Kod Paskowy ! Location ! Date Due ! Ostatnio rejestrowana ! ! "> ! &bib=&bi="> ! ! !

    *************** *** 99,106 **** ! POMOC: Musisz klikn±æ w ¿±dane kó³ko wyboru (na zielonym tle), nastêpnie albo przypisaæ pozycjê/e do istniej±cego ju¿ w systemie rekordu, ! albo zmodyfikowaæ ten rekord. JE¦LI zmiany maj± dotyczyæ jedynie niektórych pozycji, zaznacz je odpowiednio, wówczas utworzony zostanie dla nich automatycznie osobny rekord grupowy.

     

    ! --- 99,105 ---- ! HELP Należy kliknąć na odpowiedni guzik (w zielonym prostokącie) i wybrać albo przypisanie do istniejącej grupy albo modyfikację rekordu. Jeśli zmiany mają dotyczyć tylko niektórych rekordów, należy zaznaczyć je odpowiednio; stworzy to automatycznie nowy grupowy rekord.

     

    ! Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbib.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** modbib.tmpl 4 Oct 2003 09:34:15 -0000 1.2 --- modbib.tmpl 29 Feb 2004 19:47:11 -0000 1.2.2.1 *************** *** 1,57 **** ! ! ">Zmieñ dowi±zania stron ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Autor">
    Tytu³">
    Abstrakt
    Przedmiot
    Data Copyright'u">
    Tytu³ Serii">
    Autor dodatkowy">
    Podtytu³">
    Ujednolicony">
    Notatki
    Seria">

    ! ! --- 61,63 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl moditem.tmpl,1.4,1.4.2.1 modwebsites.tmpl,1.2,1.2.2.1 newimember.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9918 Modified Files: Tag: rel_2_0 moditem.tmpl modwebsites.tmpl newimember.tmpl Log Message: Index: moditem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/moditem.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** moditem.tmpl 4 Oct 2003 09:59:49 -0000 1.4 --- moditem.tmpl 29 Feb 2004 19:47:26 -0000 1.4.2.1 *************** *** 1,42 **** ! !

    ()


    --- 1,36 ---- ! !

    ()


    ! ! "> ! "> ! "> ! "> ! "> ! "> ! ! "> ! ! ! ! ! "> ! "> ! ">
    Kod kreskowy" size=40>
    Uwagi o pozycji
    Oddzia³ w³a¶ciwy" size=40>
    Zagubiona ! checked > ! Yes ! checked > ! No
    Cancelled checked > ! Yes ! checked > ! No
    ! //images/filesave.png border=0>
    *************** *** 44,46 **** ! \ No newline at end of file --- 38,40 ---- ! Index: modwebsites.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modwebsites.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** modwebsites.tmpl 4 Oct 2003 10:03:03 -0000 1.2 --- modwebsites.tmpl 29 Feb 2004 19:47:26 -0000 1.2.2.1 *************** *** 1,41 **** !

    ! ">Powrót do strony szczegó³ów !

    ! "> ! ">

    ! ! "> ! "> ! "> ! "> ! "> ! "> ! ! "> ! ! ! ! ! "> ! "> ! ">
    Kod Paskowy" size=40>
    ItemNotes
    Oddział Właściwy" size=40>
    Lost ! checked > Yes checked > No
    Anulowano checked > Yes checked > No
    ! //images/filesave.png border=0>
    ! ! ! ! !
    Tytu³">
    Opis
    URL">
    ! !

    !

    Dodaj nastêpn± stronê www

    ! "> ! ! --- 1,41 ---- !

    ! ">Return to Details Page !

    ! "> ! ">

    Tytu³
    Opis
    ! ! ! ! !
    Tytuł">
    Wyjaśnienie
    URL">
    !
    !

    !

    Dodaj nowy link witryny

    ! "> ! ! *************** *** 45,51 ****
    Tytuł
    Wyjaśnienie
    !
    ! --- 45,51 ---- ! ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newimember.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** newimember.tmpl 4 Oct 2003 10:07:48 -0000 1.3 --- newimember.tmpl 29 Feb 2004 19:47:26 -0000 1.3.2.1 *************** *** 1,19 **** ! ! ! ! ! ! Niewa¿ny numer karty.

    ! ! Warto¶ci zgodne. Kliknij OK, by potwierdziæ nowego czytelnika

    ! ! " value=""> !
    !     !     ! --- 1,180 ---- ! ! ! ! ! ! Invalid cardnumber.

    ! !

    Potwierdź Wpis

    ! ! " > ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! !
    /images/background-mem.gif"> ! NOWY CZYTELNIK !
    ! ImiÄ™ i Nazwisko ! ! !
    /images/background-mem.gif"> ! DANE CZÅONKOWSKIE !
    ! Numer Członkowski ! ! !
    ! Numer karty ! ! !
    ! Oddział Zapisu ! ! !
    /images/background-mem.gif"> ! ADRES CZYTELNIKA !
    ! Adres Pocztowy ! ! !
    ! Adres Domowy ! ! !
    /images/background-mem.gif"> ! SZCZEGÓÅY DANYCH KONTAKTOWYCH !
    ! Telefon (Dom) ! ! !
    ! Telefon (Praca) ! ! !
    ! Fax ! ! !
    ! E-mail ! ! !
    ! Komunikatory ! ! !
    /images/background-mem.gif"> ! POÅšREDNI RODZAJ KONTAKTU !
    ! ImiÄ™ i Nazwisko ! ! !
    ! Telefon ! ! !
    ! Relacja ! ! !
    ! Uwagi ! ! !
    /images/background-mem.gif"> ! UWAGI !
    ! Uwagi Ogólne ! ! !

    ! Prawidłowe wartości. Naciśnij OK by potwierdzić tego nowego czytelnika

    ! ! " value=""> !
    ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:55 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:55 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl overdue.tmpl,1.2,1.2.2.1 reports.tmpl,1.1,1.1.2.1 request.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9986 Modified Files: Tag: rel_2_0 overdue.tmpl reports.tmpl request.tmpl Log Message: Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/overdue.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** overdue.tmpl 4 Oct 2003 12:58:40 -0000 1.2 --- overdue.tmpl 29 Feb 2004 19:47:52 -0000 1.2.2.1 *************** *** 1,32 **** ! !

    Pozycje zaleg³e w dniu


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Termin zwrotuKlientTel.Tytu³ Autor
    ?subject=Overdue: ">
    ! --- 1,32 ---- ! !

    Zaległe pozycje do dnia


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Do ZwrotuPatronTelefonTytuł Autor
    ?subject=Overdue: ">
    ! Index: reports.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** reports.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- reports.tmpl 29 Feb 2004 19:47:52 -0000 1.1.2.1 *************** *** 1,8 **** ! !

    raporty

    ! ! ! ! --- 1,8 ---- ! !

    reportów

    ! ! ! ! Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/request.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** request.tmpl 4 Oct 2003 12:53:07 -0000 1.1 --- request.tmpl 29 Feb 2004 19:47:52 -0000 1.1.2.1 *************** *** 1,12 **** !
    ! /images/place-request.gif" align=right > ! "> ! "> !

    Zamawienie: ! > !

    --- 1,9 ---- ! ! "> ! "> !

    Zamówienie: >

    *************** *** 14,23 **** ! ! ! ! ! ! --- 11,20 ----
    /images/background-mem.gif">Ranga/images/background-mem.gif">Numer Cz³onka/images/background-mem.gif">Uwagi/images/background-mem.gif">Data/images/background-mem.gif">Odbiór/images/background-mem.gif">Zamówienie
    ! ! ! ! ! ! *************** *** 25,85 **** ! !
    /images/background-mem.gif">Rank/images/background-mem.gif">Member Number/images/background-mem.gif">Uwagi/images/background-mem.gif">Date/images/background-mem.gif">Pickup/images/background-mem.gif">Request
    ! Kolejna dostêpna,
    (lub wybierz z listy poni¿ej)
    ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Zamówienie/images/background-mem.gif">Typ pozycji/images/background-mem.gif">Klasyfikacja/images/background-mem.gif">Tom/images/background-mem.gif">Data publikacji/images/background-mem.gif">Egzemplarze
    ! ! Nie mo¿e byæ wybrana ! ! > ! > ! ! ! ! ! ! !
    !
    --- 22,82 ---- ! ! ! Next Available, or choose from list below ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Request/images/background-mem.gif">Typ pozycji/images/background-mem.gif">Classification/images/background-mem.gif">Tom/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! Cannot be selected ! ! > ! > ! ! ! ! ! ! !
    !
    *************** *** 89,161 **** ! action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODYFIKUJ ISTNIEJ¡CE ZAMÓWIENIA
    /images/background-mem.gif">Ranga/images/background-mem.gif">Cz³onek/images/background-mem.gif">Uwagi/images/background-mem.gif">Data/images/background-mem.gif">Odbiór/images/background-mem.gif">Zamówienie
    ! > ! > ! > ! Oczekuj±ca pozycja w > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Kolejna dostêpna ! ! ! Tylko ten typ : ! ! !
    ! Wyma¿ rezerwacjê wybieraj±c "del" z listy ranga. ! //images/2rightarrow.png">
    --- 86,159 ---- ! action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODIFY EXISTING REQUESTS
    /images/background-mem.gif">Rank/images/background-mem.gif">Member/images/background-mem.gif">Uwagi/images/background-mem.gif">Date/images/background-mem.gif">Pickup/images/background-mem.gif">Request
    ! > ! > ! > ! Item waiting at > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Next Available ! ! ! This type only : ! ! !
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> !
    *************** *** 164,166 ****

    ! --- 162,164 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:42 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newjmember.tmpl,1.2,1.2.2.1 newmember.tmpl,1.2,1.2.2.1 opac-main.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954 Modified Files: Tag: rel_2_0 newjmember.tmpl newmember.tmpl opac-main.tmpl Log Message: Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newjmember.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newjmember.tmpl 4 Oct 2003 10:10:43 -0000 1.2 --- newjmember.tmpl 29 Feb 2004 19:47:40 -0000 1.2.2.1 *************** *** 1,13 **** ! ! ! ! !

    'Potwierd¼ Wpis'

    ! ! ! " > ! --- 1,13 ---- ! ! ! ! !

    Potwierdź Wpis

    ! !
    "> NOWY CZYTELNIK
    ! " > ! *************** *** 18,30 **** ! " > ! ! " > ! --- 34,41 ---- *************** *** 45,85 ****
    "> NOWY CZYTELNIK
    ! NAZWISKO !
    "> ! SZCZEGÓ£Y CZ£ONKOWSKIE --- 18,30 ----
    ! ImiÄ™ i Nazwisko !
    "> ! DANE CZÅONKOWSKIE *************** *** 34,41 ****
    ! Numer Czytelnika !
    ! Numer Członkowski !
    !
    ! P³eæ !
    ! Szko³a !
    ! Uwagi ogólne !

    ! !

    ! ! " value=""> ! !
    !     ! --- 45,85 ---- ! ! Płeć ! ! Szkoła ! ! Uwagi Ogólne !

    ! !

    ! ! " value=""> ! !
    ! ! Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newmember.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newmember.tmpl 4 Oct 2003 12:58:40 -0000 1.2 --- newmember.tmpl 29 Feb 2004 19:47:40 -0000 1.2.2.1 *************** *** 1,55 **** ! ! !

    Potwierd¼ Wpis

    ! " > ! ! " > ! --- 1,55 ---- ! ! !

    Potwierdź Wpis

    /images/background-mem.gif"> ! NOWY CZ£ONEK
    ! Nazwisko !
    /images/background-mem.gif"> ! SZCZEGÓ£Y CZ£ONKOWSKIE
    ! Numer czytelnika !
    ! Numer Karty !
    ! Kategoria cz³onkowstwa !
    ! Op³ata !
    ! " > ! ! " > ! *************** *** 59,84 **** ! " > ! --- 59,84 ---- ! " > ! *************** *** 88,104 **** ! " > ! --- 88,108 ---- ! " > ! *************** *** 106,142 **** ! " > ! --- 110,146 ---- ! " > ! *************** *** 146,150 **** --- 150,154 ---- *************** *** 154,195 **** ! " > ! --- 158,199 ---- ! " > ! *************** *** 199,251 **** ! " > !
    /images/background-mem.gif"> ! NOWY CZYTELNIK
    ! ImiÄ™ i Nazwisko !
    /images/background-mem.gif"> ! DANE CZÅONKOWSKIE
    ! Numer Członkowski !
    ! Numer karty !
    ! Kategoria Członkowska !
    ! Opłata !
    !
    ! Termin wyga¶niêcia !
    ! Oddzia³ zapisu !
    /images/background-mem.gif"> ! DANE PERSONALNE
    !
    ! Data wygaśnięcia !
    ! Oddział Zapisu !
    /images/background-mem.gif"> ! DANE OSOBISTE
    !
    ! P³eæ !
    /images/background-mem.gif"> ADRES CZYTELNIKA !
    ! Płeć ! ! Mężczyzna ! ! Kobieta !
    /images/background-mem.gif"> ADRES CZYTELNIKA
    ! Adres pocztowy !
    ! Adres domowy !
    /images/background-mem.gif"> ! DANE OSOBY KONTAKTOWEJ
    ! Tel. (Domowy) !
    ! Tel. (W pracy) !
    ! Adres Pocztowy !
    ! Adres Domowy !
    /images/background-mem.gif"> ! SZCZEGÓÅY DANYCH KONTAKTOWYCH
    ! Tel. domowy !
    ! Tel. praca !
    !
    !
    !
    ! Text messaging !
    /images/background-mem.gif"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ
    ! Nazwisko !
    ! Tel. !
    ! Pokrewieñstwo !
    !
    ! Komunikatory !
    /images/background-mem.gif"> ! POÅšREDNI RODZAJ KONTAKTU
    ! ImiÄ™ i Nazwisko !
    ! Telefon !
    ! Relacja !
    !
    /images/background-mem.gif"> ! NOTATKI
    ! Uwagi ogólne !

    ! ! " value=""> ! !
    ! !

    B£¡D

    !

    Nastêpuj±ce pola s± ¼le wype³nione. Wróæ do poprzedniej strony i spróbuj raz jeszcze:

    ! ! Cardnumber
    !     ! ! Invalid_cardnumber
    !     ! ! Gender
    !     ! ! Given Names
    !     ! ! Surname
    !     ! ! Postal Street Address
    !     ! ! Postal city
    !     !     ! --- 203,255 ---- ! ! " > ! /images/background-mem.gif"> ! UWAGI ! Uwagi Ogólne !

    ! ! " value=""> ! !
    ! !

    BÅÄ„D

    !

    Następujące pola mają niewłaściwe wartości. Nacisnij przycisk wstecz i popraw:

    ! ! Numer karty
    ! ! ! Nie prawidłowy numer karty
    ! ! ! Płeć
    ! ! ! Imiona
    ! ! ! Nazwisko
    ! ! ! Ulica Adresu Pocztowego
    ! ! ! Miasto
    ! ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-main.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- opac-main.tmpl 29 Feb 2004 19:47:40 -0000 1.3.2.1 *************** *** 1,269 **** ! ! ! WITAMY W KATALOGU KOHA ! ! ! - - - - - - -
    - ! ! ! ! ! - -
    ! ! ! ! ! ! ! ! ! ! ! ! ! - - - - ! ! ! ! - - - - - - - - - - - - - - -

    - Koha: Katalog i us³ugi dla czytelników    		Szukaj w katalogu
       
    - -
    - ! ! Wprowad¼ wyra¿enie i naci¶nij klawisz enter.
    ! - - -Wyszukiwanie zaawansowane (wiêcej opcji)
    ! ! -

    ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! ! ! !

    Zaloguj siê do Koha

    ! ! !
    - -
    -

    -

    - --- 1,134 ---- ! ZAPRASZAMY DO KATALOGU OPAC
    ! !
    ! ! ! ! ! !

    Koha: Horowhenua Library Trust Catalogue and Member Services    		 Search the Catalogue
       

    ! Wpisz szukane słowo i naciśnij klawisz enter.
    -Szukanie Zaawansowane (Więcej Opcji)

    ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Log In to Koha

    !

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:48:07 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:48:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl reservereport.tmpl,1.1,1.1.2.1 searchheader.tmpl,1.1,1.1.2.1 shelves.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10067 Modified Files: Tag: rel_2_0 reservereport.tmpl searchheader.tmpl shelves.tmpl Log Message: Index: reservereport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reservereport.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** reservereport.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- reservereport.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,25 **** !
    ! ! --- 1,25 ---- !
    ! ! ! !
    !     
    ! ! *************** *** 27,29 ****
    ! ! ! !
    !     
    ! --- 27,29 ---- ! Index: searchheader.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/searchheader.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** searchheader.tmpl 9 Jan 2003 10:08:17 -0000 1.1 --- searchheader.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,2 **** ! >Results with dewey | >Results with biblionumber
    --- 1,2 ---- ! >Results with dewey | >Results with biblionumber
    Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/shelves.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** shelves.tmpl 9 Jan 2003 10:08:17 -0000 1.1 --- shelves.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,102 **** ! !

    Zalogowano jako: [Wyloguj]

    ! ! ! !
    !
    ! Lista pó³ek

    ! ! ! ! ! ! ! ! ! ! ! !
    ! ! !
    Dodaj ksi±¿kê wed³ug kodu kreskowego:
    !
    ! ! !
    "> ! Zawarto¶æ pó³ki shelf !
    !
    ">">" width=10 align=center>">" width=10 align=center>">" width=10 align=center>">
    !
    ! "> ! ! "> ! !

    ! ! ! !

    ! ! ! !

    ! !

    ! Modyfikuj zawarto¶æ pó³ki

    !

    Pó³ki z ksi±¿kami

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Wybierz pó³ki do wymazania !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Dodaj pó³kê:

    !

    ! !

    !
    ! ! ! !
    "> ! ! !
    "> ! Lista pó³ek !
    !
    "> ! "> ! ( ksi±¿ki) !
    !

    Dodaj lub usuñ pó³ki ! ! ! ! ! --- 1,139 ---- ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Contents of !
    ">">">">">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Dodaj książkę wg. kodu paskowego w ! ! ! ! "> ! !
    !
    ! ! ! !

    ! ! ! !

    ! !

    !

    Półki

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( książek) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Dodaj Półkę !
    !

    !
    !

    !
    !
    !
    ! ! ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> ! "> ! ( ksiÄ…zek) !
    !

    ! Dodaj lub Usuń Półki Wirtualne !

    ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:48:20 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:48:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl stats.tmpl,1.1,1.1.2.1 thesaurus_popup.tmpl,1.3,1.3.2.1 updatebiblio.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10118 Modified Files: Tag: rel_2_0 stats.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: Index: stats.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/stats.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** stats.tmpl 4 Oct 2003 12:53:07 -0000 1.1 --- stats.tmpl 29 Feb 2004 19:48:17 -0000 1.1.2.1 *************** *** 1,22 **** !
    ! ! ! ! ! ! ! ! ! !
    Nazwa TypData/czas KwotaOdzia³
    --- 1,22 ---- !
    ! ! ! ! ! ! ! ! ! !
    Imię i Nazwisko TypDate/time KwotaOddział
    *************** *** 24,33 ****

    ! Zap³acono w sumie:
    ! Odpisano w sumie:

    ! --- 24,33 ----

    ! Wpłacono w sumie:
    ! Odpisano w sumie:

    ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/thesaurus_popup.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** thesaurus_popup.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- thesaurus_popup.tmpl 29 Feb 2004 19:48:17 -0000 1.3.2.1 *************** *** 1,43 **** ! Kreator warto¶ci Tezaurusa dla kategorii <TMPL_VAR name="category"> !
    !
    !

    ! "> ! "> ! "> !

    !
    ! ! "> ! "> ! "> ! !
    ! "> ! "> ! wprowad¼ now± authority : !
    ! --- 1,45 ---- ! Tworzenie wartości tezaurusa dla kategorii <!-- TMPL_VAR name="category" -->
    !
    !

    ! "> ! "> ! "> ! "> !

    !
    ! ! "> ! "> ! "> ! "> !
    !
    ! "> ! "> ! "> ! insert a new authority : !
    ! Index: updatebiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/updatebiblio.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** updatebiblio.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- updatebiblio.tmpl 29 Feb 2004 19:48:17 -0000 1.3.2.1 *************** *** 1,14 **** ! ! !

    Kliknij "Prze¶lij..", by wymusiæ przedmiot

    ! ! " value=""> ! ! ">
    --- 1,14 ---- ! ! !

    Click submit to force the subject
    ! ! " value=""> ! ! ">
    *************** *** 16,18 **** ! --- 16,18 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:50:56 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:50:56 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator default_opac_pl_PL.po,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10624 Modified Files: default_opac_pl_PL.po Log Message: minor updates Index: default_opac_pl_PL.po =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/default_opac_pl_PL.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** default_opac_pl_PL.po 28 Feb 2004 15:18:42 -0000 1.3 --- default_opac_pl_PL.po 29 Feb 2004 19:50:53 -0000 1.4 *************** *** 8,12 **** "Project-Id-Version: default_opac_pl_PL\n" "POT-Creation-Date: 2004-02-28 14:09+0100\n" ! "PO-Revision-Date: 2004-02-28 14:26+0100\n" "Last-Translator: Benedict P. Barszcz \n" "Language-Team: Polish \n" --- 8,12 ---- "Project-Id-Version: default_opac_pl_PL\n" "POT-Creation-Date: 2004-02-28 14:09+0100\n" ! "PO-Revision-Date: 2004-02-29 20:34+0100\n" "Last-Translator: Benedict P. Barszcz \n" "Language-Team: Polish \n" *************** *** 485,489 **** #: /home/kb2qzv/CVS-Cervisia/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 ! #,fuzzy msgid "Current Loan" msgstr "Bieżące wypożyczenie" --- 485,489 ---- #: /home/kb2qzv/CVS-Cervisia/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 ! msgid "Current Loan" msgstr "Bieżące wypożyczenie" From kb2qzv at users.sourceforge.net Wed Feb 25 23:30:48 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 14:30:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-detail.tmpl,1.4.2.1,1.4.2.2 opac-main.tmpl,1.4.2.1,1.4.2.2 opac-moredetail.tmpl,1.4.2.1,1.4.2.2 opac-reserve.tmpl,1.4.2.1,1.4.2.2 opac-searchresults.tmpl,1.2.2.1,1.2.2.2 opac-search.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20449/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-searchresults.tmpl opac-search.tmpl Log Message: New, fresh translation by way of xgettext.pl Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** opac-detail.tmpl 22 Feb 2004 17:08:04 -0000 1.4.2.1 --- opac-detail.tmpl 25 Feb 2004 22:30:45 -0000 1.4.2.2 *************** *** 2,6 **** !

    ">Zamów

    --- 2,6 ---- !

    ">Zarezerwuj

    *************** *** 13,17 **** ! ( record ) --- 13,17 ---- ! ( record ) *************** *** 19,41 **** ! ISBN:">
    ! Subtitle:
    ! Autor: ">
    ! Additional Autor:
    Published by : ! in , ,
    ! Collection:
    ! Przedmiot:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number z Items:     --- 19,49 ---- ! ISBN: ">
    ! Podtytuł:
    ! Autor: ">
    ! Dodatkowy Autor:
    Published by : ! w , ,
    ! Kolekcja:
    ! ! ! ! Przedmiot(y): ! : "> !
    ! ! ! ! Rok :
    ! Uwagi:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Pozycji Razem:     *************** *** 45,51 **** ! ! ! --- 53,59 ----
    Typ pozycjiLokalizacjaDate Due Last Seen Kod paskowy
    ! ! ! *************** *** 63,69 **** ! ! --- 71,77 ---- ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** opac-main.tmpl 22 Feb 2004 17:07:51 -0000 1.4.2.1 --- opac-main.tmpl 25 Feb 2004 22:30:45 -0000 1.4.2.2 *************** *** 3,7 **** ! WELCOME TO THE KOHA OPAC !
    Typ PozycjiMiejsceDo Zwrotu Last Seen Kod paskowy
    Website OnlineAvailable  
    Witryna OnlineDostÄ™pna  
    ! ! /images/background-mem.gif"> ! *************** *** 54,67 ****
    !
    ! ! ! !
    ">//images/fileopen.png">">NormalOpis MARC :
    --- 8,25 ---- ! --- 27,55 ---- !
    ! ! /images/background-mem.gif"> ! !
    ! ! ! ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">Zwykłe')">Drukuj')">Dodaj na półkęOpis MARC :
    *************** *** 24,52 ****
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Pozycja
    !
    		! ! ! class="button">Zamów !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    !
    		! ! ! " class="button">Request !
    ! ! /images/background-mem.gif"> ! ! ! ! ! --- 57,70 ----
    !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! *************** *** 71,240 ****
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! ! !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/moredetail.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** moredetail.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- moredetail.tmpl 29 Feb 2004 19:41:43 -0000 1.1.2.1 *************** *** 1,53 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !

    ! ! ! ! &type=intra> ! ()

    ! > ! > ! ! --- 1,48 ---- !

    ! !
    GRUPA -
    ! !
    ! Numer opisu:
    ! Typ pozycji:
    ! URL:
    ! Okres wypo¿yczenia:
    ! Op³ata za wypo¿yczenie:
    ! Classification:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilus:
    ! Wymiary:
    ! Notatki:
    ! W sumie pozycji:
    ! ! ! !
    ! >Requests !
    !

    &type=intra> ()

    ! > ! > ! ! *************** *** 55,99 ****
    /images/background-mem.gif" ! > GRUPA -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Numeropisu:
    ! Typ pozycji:
    ! URL:
    ! Okres wypożyczenia:
    ! Opłata wynajmu:
    ! Klasyfikacja:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilus:
    ! Rozmiar:
    ! Uwagi:
    ! Liczba Egzemplarzy:
    ! ! ! !
    KOD KRESKOWY !
    ! > ! > ! > ! !
    ! Odzia³ w³a¶ciwy:
    ! Oddano?:
    ! Wypo¿yczono?:
    ! Ostatni czytelnik 1:
    ! Ostatni czytelnik 2:
    ! Bie¿±cy oddzia³:
    ! Cena wymiany:
    ! Pozycja zagubiona:
    ! Zap³acono dla:
    ! Uwagi:
    ! Wznowienia:
    ! &biblio=&invoice=&catview=yes"> ! Accession ! Data:
    ! Anulowano:
    &bi=&itm=> ! W sumie wypo¿yczeñ:
    ! Numer grupy:
    ! Numer opisu:
    --- 50,90 ----
    ! ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">BARCODE
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Oddział Właściwy:
    ! Ostatnio rejestrowana:
    ! Ostatnio pozyczono:
    ! ! ! Ostatni Czytelnik 1:
    ! Ostatni Czytelnik 2:
    ! Obecny Oddział:
    ! Cena Wymiany:
    ! Egzemplarz zgubiony:
    ! Opłacono przez:
    ! Uwagi:
    ! Przedłużenia:
    ! &biblio=&invoice=&catview=yes"> Nabyto dnia:
    ! Anulowano:
    &bi=&itm=>Wypożyczeń w sumie:
    ! Numer Grupy:
    ! Numer Opisu:
    *************** *** 104,108 ****
    !

    --- 95,99 ----

    !

    *************** *** 110,112 ****

    ! --- 101,103 ----
    ! Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** searchresults.tmpl 27 Oct 2003 15:41:28 -0000 1.2 --- searchresults.tmpl 29 Feb 2004 19:41:43 -0000 1.2.2.1 *************** *** 1,83 **** ! ! ! ! !
    ! ! Szuka³e¶ ! ! Nie poda³e¶ kryteriów wyszukiwania
    !     ! znalezionych trafieñ

    ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> !

    ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> --- 1,87 ---- ! ! ! ! !
    ! ! You searched on ! ! You did not specify any seach criteria
    ! ! znalezionych rekordów

    ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> !

    !

    Tytu³Autor©Ilo¶æLokalizacja 
    ?type=opacintra&bib=>&type=opacintra> >Request
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! &=&type=opacintra>Next Records ! !   !
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> *************** *** 85,101 ****
    ! Wyniki do z trafieñ.
    ! Jeszcze jedno wyszukiwanie ! ! Jeszcze jedno wyszukiwanie ! ! ! ! ! ! --- 89,105 ----
    ! Wyświetlono od do z rekordów.
    ! Spróbuj innej kwerendy ! ! Spróbuj innej kwerendy ! ! ! ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:41:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:41:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ branchtransfers.tmpl,1.1,1.1.2.1 circulation.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8601/circ Modified Files: Tag: rel_2_0 branchtransfers.tmpl circulation.tmpl Log Message: Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/branchtransfers.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** branchtransfers.tmpl 26 Oct 2003 23:39:41 -0000 1.1 --- branchtransfers.tmpl 29 Feb 2004 19:41:57 -0000 1.1.2.1 *************** *** 1,77 **** !
    TytuÅ‚Autor©Item CountLocation 
    ?type=opacintra&bib=>&type=opacintra> >RequestNot Reservable
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! &=&type=opacintra>Next Records ! !   !
    ! ! Nastêpny Czytelnik ! ! Zwroty
    !

    Wypo¿yczalnia: Transfery


    ! Oddzia³:   ! Drukarka:
    ! Zmieñ ustawienia ! > ! >

    ! ! ! > ! > !

    ! ! !

    /images/background-mem.gif">Wykryto rezerwacjê
    ! Zarezerwowano: wykryto rezerwacjê dla (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Pozycja oznaczona czeka:
    ! Pozycja jest oznaczona i czeka w dla (" onClick="openWindow(this,'Member', 480, 640); return false;">).
     ! ! ! > ! > !

    ! !

    ! Ustaw rezerwacjê jako czekaj±c± i transferuj ksi±¿ke do : ! Uniewa¿nij rezerwacjê, nastêpnie spróbuj transferowaæ:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Uniewa¿nij rezerwacjê, nastêpnie spróbuj transferowaæ:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignoruj i powróæ do transferów:
    ! > ! ! value=> ! value=> ! value=> !
    --- 1,73 ---- !
    ! Next Borrower Returns
    !

    Cyrkulacja: Transfery


    ! OddziaÅ‚:   Drukarka:
    ! Zmień Ustawienia ! > ! >

    ! !
    /images/background-mem.gif">Znaleziono RezerwacjÄ™
    ! Reserved: reserve found for (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Oznaczona jako OczekujÄ…ca
    ! Item is marked waiting at for (" onClick="openWindow(this,'Member', 480, 640); return false;">).
    ! !
    ! Set reserve to waiting and transfer book to : ! Anuluj rezerwację a następnie spróbuj transferu:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Anuluj rezerwację a następnie spróbuj transferu:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignore and return to transfers:
    ! > ! ! value=> ! value=> ! value=> !
    *************** *** 80,162 ****
    ! !
    /images/background-mem.gif">Wiadomo¶ci
    ! ! ! Rezerwacja uniewa¿niona
    !     ! ! Pozycja powinna teraz czekaæ w oddziale:
    !     !     ! ! ! Brak pozycji o kodzie kreskowym: ! ! ! Proszê zwrócic pozycjê do rodzimego oddzia³u: ! ! ! Pozycja ju¿ jest w docelowym oddziale. ! ! ! Pozycjê wypo¿yczy³/a " ! onClick="openWindow(this,'Member', 480, 640); return false;"> ! i zosta³a zwrócona. !
    !
    ! /images/holder.gif" width=24 height=24>
    ! !
    /images/background-mem.gif"> ! Wybierz oddzia³
    Oddzia³ docelowy:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Wprowad¼ kod kreskowy ksi±¿ki
    Kod kreskowy pozycji:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Pozycje transferowane
    Kod kreskowyTytu³AutorTypOdDo
    align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center> align=center> align=center>
    ! ! ! --- 76,157 ----

    ! !
    /images/background-mem.gif">Komunikaty
    ! ! ! Reserve Cancelled
    ! ! ! Item should now be waiting at branch:
    ! ! ! ! ! Brak egzemplarza o kodzie: ! ! ! Please return item to home branch: ! ! ! Item is already at destination branch. ! ! ! Item was on loan to " ! onClick="openWindow(this,'Member', 480, 640); return false;"> and has been returned. !
    !
    ! /images/holder.gif" width=24 height=24>

    ! !
    /images/background-mem.gif"> ! Wybierz Oddział
    Oddział Docelowy:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Kod Paskowy Książki
    Kod paskowy pozycji:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Transfered Items
    Kod PaskowyTytułAutorTypFromTo
    > ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> >>>
    ! ! ! Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/circulation.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** circulation.tmpl 29 Oct 2003 23:38:05 -0000 1.2 --- circulation.tmpl 29 Feb 2004 19:41:57 -0000 1.2.2.1 *************** *** 1,62 **** ! ! !
    ! &branch=&printer=&print=yes> ! Nastêpny czytelnik  ! ! Zwroty  ! ! Transfery
    !

    Wypo¿yczalnia: wypo¿yczenia


    ! Oddzia³:
    ! Drukarka:
    ! Zmieñ ustawienia
    ! ! Zwroty ! !   ! ! Transfery !
    !

    Wypo¿yczalnia: wypo¿yczenia


    ! Oddzia³:
    ! Drukarka:
    ! Zmieñ ustawienia
    ! !
    /images/background-mem.gif"> ! Issuing Question
    ! --- 1,50 ---- ! ! !
    ! Próba wypo¿yczenia ! autorstwa dla . !

    ! &branch=&printer=&print=yes"> NastÄ™pny Czytelnik  Zwroty  Transfery
    !

    Cyrkulacja: Wypożyczenia


    ! Oddział:
    ! Drukarka:
    ! Zmień Ustawienia ! "> ! "> !

     

    ! !
    ! Zwroty   Transfery
    !

    Cyrkulacja: Wypożyczenia


    ! Oddział:
    ! Drukarka:
    ! Zmień Ustawienia ! "> ! "> !

     

    ! ! ! ! ! --- 25,29 ---- ! From tipaul at users.sourceforge.net Fri Feb 6 15:12:06 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members imemberentry.tmpl,1.6,1.6.2.1 jmemberentry.tmpl,1.7,1.7.2.1 memberentry.tmpl,1.21.2.1,1.21.2.2 member-password.tmpl,1.5,1.5.2.1 member.tmpl,1.8,1.8.2.1 moremember.tmpl,1.23.2.2,1.23.2.3 readingrec.tmpl,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/koha-tmpl/intranet-tmpl/default/en/members Modified Files: Tag: rel_2_0 imemberentry.tmpl jmemberentry.tmpl memberentry.tmpl member-password.tmpl member.tmpl moremember.tmpl readingrec.tmpl Log Message: template fixes for translation Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** imemberentry.tmpl 9 Dec 2003 10:29:02 -0000 1.6 --- imemberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.6.2.1 *************** *** 22,26 **** --- 22,26 ---- Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** jmemberentry.tmpl 9 Dec 2003 10:29:02 -0000 1.7 --- jmemberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.7.2.1 *************** *** 53,57 **** ! --- 23,27 ---- ! Index: member-password.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** member-password.tmpl 9 Dec 2003 10:29:03 -0000 1.5 --- member-password.tmpl 6 Feb 2004 14:12:04 -0000 1.5.2.1 *************** *** 16,20 **** New Password: >

    ! --- 16,20 ---- New Password: >

    ! Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** member.tmpl 9 Dec 2003 10:29:03 -0000 1.8 --- member.tmpl 6 Feb 2004 14:12:04 -0000 1.8.2.1 *************** *** 42,46 ****
    ! Adult Organisation --- 42,46 ---- ! Adult Organisation Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v retrieving revision 1.23.2.2 retrieving revision 1.23.2.3 diff -C2 -r1.23.2.2 -r1.23.2.3 *** moremember.tmpl 26 Jan 2004 10:46:35 -0000 1.23.2.2 --- moremember.tmpl 6 Feb 2004 14:12:04 -0000 1.23.2.3 *************** *** 15,19 ****

    ! --- 92,97 ---- ! ! Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -r1.17 -r1.17.2.1 *** authorised_values.tmpl 9 Dec 2003 10:29:00 -0000 1.17 --- authorised_values.tmpl 6 Feb 2004 14:12:27 -0000 1.17.2.1 *************** *** 51,56 ****

    Authorised values admin

    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.

    !

    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 subfield is not entered through a free field, but though a list of authorised values.

    New category... --- 51,55 ----

    Authorised values admin

    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.

    !

    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 subfield is not entered through a free field, but though a list of authorised values.

    New category... Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -r1.18 -r1.18.2.1 *** branches.tmpl 9 Dec 2003 10:29:00 -0000 1.18 --- branches.tmpl 6 Feb 2004 14:12:27 -0000 1.18.2.1 *************** *** 2,5 **** --- 2,6 ---- +


    *************** *** 57,61 **** !
    /images/background-mem.gif"> ! Pytanie Wypożyczenia
    ! *************** *** 65,105 **** !
    ! Próba wypożyczenia przez dla . !

    ! --- 53,93 ---- ! ! ! !
    !
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    		!
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    ! *************** *** 110,219 ****
    !
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    		!
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    ! !
    B³±d przy wypo¿yczeniu

    ! ! ! ! !
    /images/background-mem.gif">Wiadomo¶æ
    !     ! !
    ! > ! > ! ! !
    /images/background-mem.gif"> ! Wybierz czytelnika
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Wprowad¼ numer karty czytelnika
    lub fragment nazwiska
    ! ! > ! >
    !     !
    ! ! --- 24,28 ---- ! *************** *** 77,81 **** ! --- 77,81 ---- ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** newimember.tmpl 22 Dec 2003 14:56:35 -0000 1.4.2.1 --- newimember.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.2 *************** *** 37,41 **** ! --- 45,49 ---- ! *************** *** 142,149 **** ! Next Available ! This type only : --- 142,149 ---- ! Next Available ! This type only : *************** *** 155,160 ****
    !
    ! ! ! ! !
    ! ! ! --- 98,207 ----
    /images/background-mem.gif"> ! Wprowad¼ kod kreskowy ksi±¿ki
    ! ! ! ! !
    Kod kreskowy pozycji:
    !
    ! ! !
    ! > Sticky Due Date
    ! > ! > ! > ! ! ! ! > !
    ! !
    Błąd Wypożyczenia Książki

    ! ! ! ! !
    /images/background-mem.gif">Komunikaty
    Nie znaleziono czytelnika
    ! ! ! ! "> ! "> ! ! !
    /images/background-mem.gif"> ! Wybierz czytelnika
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Wprowadź kartę czytelnika
    lub poczÄ…tek nazwiska
    ! ! "> ! ">
    ! ! !
    !
    ! !
    ! ! ! *************** *** 225,312 ****
    /images/background-mem.gif"> ! Kod Paskowy Książki
    ! ! ! ! !
    Kod paskowy pozycji:
    !
    ! ! !
    ! > Sticky Due Date
    ! "> ! "> ! "> ! ! ! ! "> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Dane czytelnika
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Kategoria:
    OBCI¡¯ENIA> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    OBCI¡¯ENIA onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    CZEKA ! ! &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
    !
    Zaleg³o¶ciTak, patrz ni¿ej
    UWAGI
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Wypo¿yczenia dzi¶
    Termin zwrotuKod kreskowyTytu³AutorKlasa
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Poprzednie wypo¿yczenia
    Termin zwrotuKod kreskowyTytu³AutorKlasa
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! --- 213,309 ----

    		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    O czytelniku
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Kategoria:
    GNA>Czytelnik zniknÄ…Å‚ bez adresu
    ZGUBIONA>Karta czytelnika zaginęła
    ODBLOKOWANY>Czytelnik jest odblokowany
    OPÅATY>" onClick="openWindow(this, 'Payment', 480,640)">PÅ‚atność
    >
    OPÅATY" onClick="openWindow(this, 'Payment', 480,640)">PÅ‚atność
    OCZEKUJÄ„CE ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640)"> ()
    !
    ZLEGÅETak, zob. poniżej
    UWAGI
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Dzisiejsze Wypożyczenia
    Do ZwrotuKod PaskowyTytułAutorTyp pozycji
    >> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">">">">
    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Poprzednie Wypożyczenia
    Do ZwrotuKod PaskowyTytułAutorTyp pozycji
    ">"> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">">">">
    ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:45:41 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:45:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters koha2marclinks.tmpl,1.1,1.1.2.1 marc_subfields_structure.tmpl,1.2,1.2.2.1 marctagstructure.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9524/parameters Modified Files: Tag: rel_2_0 koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl Log Message: Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/koha2marclinks.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** koha2marclinks.tmpl 10 Jan 2003 19:46:32 -0000 1.1 --- koha2marclinks.tmpl 29 Feb 2004 19:45:39 -0000 1.1.2.1 *************** *** 1,22 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! !

    !

    Wybierz i sprawd¼ 1 z nastêpuj±cych dla .

    !
    ! "> ! "> ! --- 1,16 ---- ! ! ! !

    !

    Choose and validate 1 of the following for .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! "> ! "> ! *************** *** 26,35 ****
    ! "> ! "> ! --- 20,29 ----
    ! "> ! "> ! *************** *** 39,48 ****
    ! "> ! "> ! --- 33,42 ----
    ! "> ! "> ! *************** *** 52,61 ****
    ! "> ! "> ! --- 46,55 ----
    ! "> ! "> ! *************** *** 65,74 ****
    ! "> ! "> ! --- 59,68 ----
    ! "> ! "> ! *************** *** 78,87 ****
    ! "> ! "> ! --- 72,81 ----
    ! "> ! "> ! *************** *** 91,100 ****
    ! "> ! "> ! --- 85,94 ----
    ! "> ! "> ! *************** *** 104,113 ****
    ! "> ! "> ! --- 98,107 ----
    ! "> ! "> ! *************** *** 117,126 ****
    ! "> ! "> ! --- 111,120 ----
    ! "> ! "> ! *************** *** 130,139 ****
    ! "> ! "> ! --- 124,133 ----
    ! "> ! "> ! *************** *** 144,154 ****
    !

    Aby "odmapowaæ", kliknij ==>

    		 ! ! "> ! "> --- 138,148 ----
    !

    To "unmap", click ==>

    		 ! ! "> ! "> *************** *** 157,189 ****
    ! ! ! ! Linki MARC !

    ! ! ! ! ! ! ! ! ! ! ! ! !
    Pole koha ?EtykietaPodpoleLib ! !
    ">edytuj
    !     ! ! --- 151,183 ----
    ! ! ! ! ÅÄ…cza MARC !

    NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script. !

    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    Koha field ?TagSubfieldLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** marc_subfields_structure.tmpl 27 Jan 2003 08:15:40 -0000 1.2 --- marc_subfields_structure.tmpl 29 Feb 2004 19:45:39 -0000 1.2.2.1 *************** *** 2,118 **** ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    Pole Lib for librarians / for opac Repet MandPole Koha TabAuthorised value or
    ! Thesaurus category
    -
    !
    ! or
    ! or
    !

    Uwaga: w ostatniej kolumnie nale¿y wybraæ: !

    • "Warto¶æ autoryzown±": Odnosi siê do szeregu warto¶ci autoryzowanych dla tego podpola. Spójrz: odpowiednia tablica administratora
      • !
    • "Kategoria tezaurusa": Odnosi siê do kategorii tezaurusa. Zobacz odpowiedni± tablice administratora.
      • !
    • "Kreator warto¶ci: Jest to program w perlu, który pomaga wybraæ warto¶æ pola. Zale¿y on od odmiany-MARC i wype³nia automatycznie niektóre podpola.

    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! dane wymazane !
    '> !     ! ! ! ! ! ! ! ! ! !
    Podpole
     
    POTWIERD¬ WYMAZANIE
    ">
    TakNieTakNie">usuñ
    - ! ! !
    ">Powrót do znaczników
    !     ! --- 2,112 ---- ! ! ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Field Lib for librarians / for opac Repet MandKoha field TabWartość autoryzowana lub
    ! Kategoria tezaurusa
    - " size=40 maxlength=80>
    ! " size=40 maxlength=80>
    ! or
    ! or
    !

    Note: in the last column, you can choose: !

    • An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.
      • !
    • A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.
      • !
    • A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Data deleted ! "> ! ! ! !

    Admin struktury podpól MARC dla

    !

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    !

    The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    ! !
    Subfield
     
    POTWIERDZENIE WYMAZANIA
    ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SubfieldLibKoha field ?Rep ?Mand ?Tab ?Wartości ?Tezaurus ?Val build ?Wymaż
    TakNieTakNie">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marctagstructure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** marctagstructure.tmpl 10 Jan 2003 16:45:34 -0000 1.2 --- marctagstructure.tmpl 29 Feb 2004 19:45:39 -0000 1.2.2.1 *************** *** 1,9 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj siê do Koha

    !     ! ! !

    !
    ! ! ! ! ! !
    Zmienna
    Lib for librarians
    Lib for opac
    Powtarzalne
    Konieczne
    Warto¶æ autoryzowana (je¶li wybierzesz jak±¶ warto¶æ tutaj, wska¼niki zostan± ograniczone tylko do zbioru tych warto¶ci)
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! dane usuniêto !
    !     ! ! ! Zarz±dzaj struktur± etykiet MARC (znaczników) !
    ! !
    Etykieta (znacznik)
     
    POTWIERD¬ USUNIÊCIE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    EtykietaLibPowtarzalnaKoniecznaAutoryzowana
    warto¶æ    		Podpola  
    TakNieTakNie">podpola">Edytuj">Usuñ
    ! ! !
    -

    !     ! ! ! --- 52,152 ---- ! ! !

    !
    ! ! ! ! ! !
    Tag
    Lib for librarians
    Lib for opac
    Repeatable
    Mandatory
    Wartość Autoryzowana (jeśli wprowadzisz tutaj jakąś wartość to wskaźniki będą ograniczone do listy autoryzowanych wartości)
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Data deleted ! ! ! ! !

    MARC tag structure admin

    ! NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script. ! ! !
    /images/background-mem.gif">tag/images/background-mem.gif">
     
    POTWIERDZENIE WYMAZANIA
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Tag/images/background-mem.gif">Lib/images/background-mem.gif">Repeatable/images/background-mem.gif">Mandatory/images/background-mem.gif">Autoryzowana
    wartość    		/images/background-mem.gif">Subfields/images/background-mem.gif">Edytuj/images/background-mem.gif">Wymaż
    TakNieTakNie">subfields">//images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">//images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    ! ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
    ! ! From rangi at users.sourceforge.net Sun Feb 1 06:21:24 2004 From: rangi at users.sourceforge.net (Chris Cormack) Date: Sat, 31 Jan 2004 21:21:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-user.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8254/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: Fix for 617 and 615 Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-user.tmpl 18 Mar 2003 19:52:37 -0000 1.2 --- opac-user.tmpl 1 Feb 2004 05:21:21 -0000 1.2.2.1 *************** *** 140,144 **** --- 140,148 ----
    		+ + Not renewable + Renew + Not renewable *************** *** 227,231 **** ! Renew --- 231,235 ---- ! Renew From rangi at users.sourceforge.net Sun Feb 1 06:34:19 2004 From: rangi at users.sourceforge.net (Chris Cormack) Date: Sat, 31 Jan 2004 21:34:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-user.tmpl,1.2.2.1,1.2.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19230/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: missed one instance of renewable Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** opac-user.tmpl 1 Feb 2004 05:21:21 -0000 1.2.2.1 --- opac-user.tmpl 1 Feb 2004 05:34:17 -0000 1.2.2.2 *************** *** 139,143 **** ! Not renewable --- 139,143 ---- ! Not renewable From tipaul at users.sourceforge.net Fri Feb 6 15:06:39 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:06:39 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.fr,1.1.2.3,1.1.2.4 tmpl_process.pl,1.5.2.6,1.5.2.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7144/misc/translator Modified Files: Tag: rel_2_0 intranet.fr tmpl_process.pl Log Message: updated french translation Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** intranet.fr 26 Jan 2004 10:42:27 -0000 1.1.2.3 --- intranet.fr 6 Feb 2004 14:06:36 -0000 1.1.2.4 *************** *** 1,19 **** A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table Une "cat?gorie th?saurus": se r?f?re ? une cat?gorie du th?saurus. Voir la table admin correspondante. A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically Un "constructeur de valeur": les constructeurs de valeurs sont des programmes Perl qui vous aide ? s?lectionner les entr?es d'un champ selon une syntaxe MARC. Ils remplissent aussi parfois automatiquement des sous-champs. - A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm UNUSED;Une notice MARC est stock?e dans le r?servoir aussi lontemps que vous ne lui liez pas d'ouvrage. Lorsque vous saisissez un ISBN ou un titre d'ouvrage, les notices du r?servoire sont pass?es en revues. Si une notice correspondante est trouv?e, elle est transf?r?e dans la table active de Koha et supprim?e du r?servoire. About A propos Abstract R?sum? ! Account for ***** Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE Acquisitions Acquisitions ! acquisitions UNUSED;acquisitions [...1006 lines suppressed...] ! Volume Info (for serials) Info Volume (pour p?riodiques) Waiting En attente WAITING EN ATTENTE --- 1058,1073 ---- value=> ***** values authorised for this subfield valeurs autoris?es pour ce sous-champ ! Values related to ***** ! Values related to () UNUSED;1 Variable Variable Various parameters Divers param?tres View Basket Voir Panier Virtual Bookshelves Rayonnages virtuels + Virtual shelves Rayonnages virtuels Volume Volume Volume Date Date Volume Volume Description Description Volume ! Volume Info (for serials ***** ! Volume Info (for serials) UNUSED;Info Volume (pour p?riodiques) Waiting En attente WAITING EN ATTENTE Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.5.2.6 retrieving revision 1.5.2.7 diff -C2 -r1.5.2.6 -r1.5.2.7 *** tmpl_process.pl 28 Jan 2004 16:46:23 -0000 1.5.2.6 --- tmpl_process.pl 6 Feb 2004 14:06:36 -0000 1.5.2.7 *************** *** 295,299 **** print "Processing $in...\n"; ! # Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; --- 295,299 ---- print "Processing $in...\n"; ! # 'Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; *************** *** 304,309 **** { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^\s+//; # remove trailing blanks, ':' or '*' ! $str =~ s/[\s\*:\[*\(|\.,]*$//; # the line begins with letter(s) followed by optional words and/or spaces --- 304,309 ---- { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^[\s+:\(]*//; # remove useless characters ! $str =~ s/[\s\*:\[*\(|\.,\)]*$//; # the line begins with letter(s) followed by optional words and/or spaces From tipaul at users.sourceforge.net Fri Feb 6 15:10:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:10:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en auth.tmpl,1.4.2.1,1.4.2.2 default.tmpl,1.2,1.2.2.1 member-flags.tmpl,1.2,1.2.2.1 modbibitem.tmpl,1.5,1.5.2.1 newimember.tmpl,1.4.2.1,1.4.2.2 newjmember.tmpl,1.4,1.4.2.1 newmember.tmpl,1.10.2.1,1.10.2.2 opac-main.tmpl,1.2,1.2.2.1 request.tmpl,1.10.2.1,1.10.2.2 shelves.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8000/koha-tmpl/intranet-tmpl/default/en Modified Files: Tag: rel_2_0 auth.tmpl default.tmpl member-flags.tmpl modbibitem.tmpl newimember.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl request.tmpl shelves.tmpl Log Message: template fixes for translation Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** auth.tmpl 19 Dec 2003 17:19:48 -0000 1.4.2.1 --- auth.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.2 *************** *** 35,39 **** ! --- 35,39 ----
    Koha Login
    Cardnumber:
    Password:
    ! Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/default.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** default.tmpl 9 Dec 2003 10:28:57 -0000 1.2 --- default.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 24,28 ****
    Koha Login
    Card number:
    Password:

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/member-flags.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** member-flags.tmpl 9 Dec 2003 10:28:57 -0000 1.2 --- member-flags.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 23,27 ****

    ! --- 23,27 ----

    ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** modbibitem.tmpl 9 Dec 2003 10:28:57 -0000 1.5 --- modbibitem.tmpl 6 Feb 2004 14:10:06 -0000 1.5.2.1 *************** *** 24,28 ****

    Item Type" size=20>
    Item type" size=20>
    Location Date DueLast Seen
    Location Date DueLast seen
    ! Card Number --- 37,41 ----
    ! Card number Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** newjmember.tmpl 9 Dec 2003 10:28:58 -0000 1.4 --- newjmember.tmpl 6 Feb 2004 14:10:06 -0000 1.4.2.1 *************** *** 42,46 ****
    ! Date Of Birth --- 42,46 ----
    ! Date of birth Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -r1.10.2.1 -r1.10.2.2 *** newmember.tmpl 26 Jan 2004 10:46:35 -0000 1.10.2.1 --- newmember.tmpl 6 Feb 2004 14:10:06 -0000 1.10.2.2 *************** *** 32,36 ****
    ! Card Number --- 32,36 ----
    ! Card number *************** *** 85,89 ****
    ! Date Of Birth --- 85,89 ----
    ! Date of birth *************** *** 230,237 ****

    The following fields have a forbidden value. Please push the back button and try again :

    ! Cardnumber
    ! Invalid_cardnumber
    --- 230,237 ----

    The following fields have a forbidden value. Please push the back button and try again :

    ! Card number
    ! Invalid cardnumber
    Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-main.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- opac-main.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 1,134 **** ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -r1.10.2.1 -r1.10.2.2 *** request.tmpl 26 Jan 2004 10:46:35 -0000 1.10.2.1 --- request.tmpl 6 Feb 2004 14:10:06 -0000 1.10.2.2 *************** *** 45,49 ****
    /images/background-mem.gif">Request/images/background-mem.gif">Item Type /images/background-mem.gif">Classification /images/background-mem.gif">Volume
    /images/background-mem.gif">Request/images/background-mem.gif">Item type /images/background-mem.gif">Classification /images/background-mem.gif">Volume
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png">
    --- 155,161 ----
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> !
    Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** shelves.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- shelves.tmpl 6 Feb 2004 14:10:06 -0000 1.2.2.1 *************** *** 1,41 **** -

    Logged in as: [Log Out]

    - - !
    !
    ! Shelf List

    ! ! - - - !
    ! ! !
    Add a book by barcode:
    !
    ! ! !
    "> ! Contents of shelf !
    !
    ">">" width=10 align=center> ">" width=10 align=center> ">" width=10 align=center> ">
    !
    ! "> ! ! "> ! !

    --- 1,47 ---- !
    !
    ! ! ! ! !
    "> ! Contents of !
    ">"> "> "> ">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Add a book by barcode in : ! ! ! ! "> ! !
    !
    *************** *** 49,102 ****
    - Modify Shelf Contents

    Bookshelves

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Add Shelf:

    !

    ! !

    ! !
    "> ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    Add or Remove Book Shelves - ! ! \ No newline at end of file --- 55,139 ----

    Bookshelves

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Add Shelf !
    !

    !
    !

    !
    !
    ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    ! Add or Remove Book Shelves !

    ! From tipaul at users.sourceforge.net Fri Feb 6 15:12:06 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport AcceptItemCopy.tmpl,1.3,1.3.2.1 marcimportdetail.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/koha-tmpl/intranet-tmpl/default/en/marcimport Modified Files: Tag: rel_2_0 AcceptItemCopy.tmpl marcimportdetail.tmpl Log Message: template fixes for translation Index: AcceptItemCopy.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** AcceptItemCopy.tmpl 9 Dec 2003 10:29:03 -0000 1.3 --- AcceptItemCopy.tmpl 6 Feb 2004 14:12:04 -0000 1.3.2.1 *************** *** 2,6 ****
    ! Barcode '' has already been assigned.

    --- 2,6 ----

    ! Barcode has already been assigned.

    Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** marcimportdetail.tmpl 9 Dec 2003 10:29:03 -0000 1.3 --- marcimportdetail.tmpl 6 Feb 2004 14:12:04 -0000 1.3.2.1 *************** *** 25,29 ****

    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item Type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    ! Member# , Card Number* >
    ! Member# , Card number* >
    ! Member# , Card Number* --- 53,57 ----
    ! Member# , Card number* Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -C2 -r1.21.2.1 -r1.21.2.2 *** memberentry.tmpl 26 Jan 2004 10:46:35 -0000 1.21.2.1 --- memberentry.tmpl 6 Feb 2004 14:12:04 -0000 1.21.2.2 *************** *** 1,11 **** -

    ! Add Member Update Member Details !


    --- 1,14 ---- !

    ! Add member !

    +

    Update Member Details +

    !
    *************** *** 20,24 ****
    Member# , Card Number*
    Member# , Card number*
    (, )

    ! Card Number:
    Postal Address: ,
    Home Address: ,
    --- 15,19 ----

    		(, )

    ! Card number:
    Postal Address: ,
    Home Address: ,
    Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** readingrec.tmpl 22 Dec 2003 10:56:19 -0000 1.7.2.1 --- readingrec.tmpl 6 Feb 2004 14:12:04 -0000 1.7.2.2 *************** *** 3,7 ****


    Member Number: !
    Card Number:

    --- 3,7 ----


    Member Number: !
    Card number:

    From tipaul at users.sourceforge.net Fri Feb 6 15:12:31 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:12:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbudget.tmpl,1.20,1.20.2.1 authorised_values.tmpl,1.17,1.17.2.1 branches.tmpl,1.18,1.18.2.1 categorie.tmpl,1.15,1.15.2.1 categoryitem.tmpl,1.7,1.7.2.1 charges.tmpl,1.2,1.2.2.1 currency.tmpl,1.7,1.7.2.1 itemtypes.tmpl,1.14.2.1,1.14.2.2 koha2marclinks.tmpl,1.9,1.9.2.1 marc_subfields_structure.tmpl,1.23.2.1,1.23.2.2 printers.tmpl,1.8,1.8.2.1 thesaurus.tmpl,1.17.2.1,1.17.2.2 z3950servers.tmpl,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8520/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: Tag: rel_2_0 aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl printers.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: template fixes for translation Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -r1.20 -r1.20.2.1 *** aqbudget.tmpl 9 Dec 2003 10:29:00 -0000 1.20 --- aqbudget.tmpl 6 Feb 2004 14:12:26 -0000 1.20.2.1 *************** *** 92,97 **** !

    Start date () 
    End date ()
    Budget amount
     ">
    Start date () 
    End date ()
    Budget amount
     ">
     
    --- 58,62 ----
     
    *************** *** 127,131 **** ! --- 128,132 ---- ! Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -r1.15 -r1.15.2.1 *** categorie.tmpl 9 Dec 2003 10:29:00 -0000 1.15 --- categorie.tmpl 6 Feb 2004 14:12:27 -0000 1.15.2.1 *************** *** 194,201 **** - Bulk - - - Enrollment fee --- 194,197 ---- *************** *** 238,242 **** Data deleted !

    --- 234,238 ---- Data deleted !
    *************** *** 247,270 ****

    Category admin

    ! You Searched for !
    ! > !
    ! ! - - ! --- 243,265 ----

    Category admin

    ! You Searched for ! ! > ! !
    Category DescriptionEnrollment Upper Age Limit Age Required FineBulkFee OverdueIssue Limit Reserve
    ! ! ! *************** *** 276,285 **** ! ! ! --- 271,284 ---- + ! *************** *** 292,296 ****

    !

    --- 291,295 ----

    !

    Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** categoryitem.tmpl 9 Dec 2003 10:29:00 -0000 1.7 --- categoryitem.tmpl 6 Feb 2004 14:12:27 -0000 1.7.2.1 *************** *** 269,273 **** ! --- 269,273 ---- ! *************** *** 294,298 ****

    !

    --- 294,298 ----

    !

    Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/charges.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** charges.tmpl 9 Dec 2003 10:29:00 -0000 1.2 --- charges.tmpl 6 Feb 2004 14:12:27 -0000 1.2.2.1 *************** *** 2,8 ****

    Each box needs to be filled in with fine,time to start charging,charging cycle
    ! eg 1,7,7 = $1 fine, after 7 days, every 7 days

    !

    Note : fines are calculated by the fines2.pl script, located in misc directory. ! Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

    --- 2,7 ----

    Each box needs to be filled in with fine,time to start charging,charging cycle
    ! eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    !

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

    Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** currency.tmpl 9 Dec 2003 10:29:00 -0000 1.7 --- currency.tmpl 6 Feb 2004 14:12:27 -0000 1.7.2.1 *************** *** 182,187 **** ! ! --- 182,187 ---- ! ! *************** *** 202,206 ****
    !
    --- 202,206 ----
    !
    Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -r1.14.2.1 -r1.14.2.2 *** itemtypes.tmpl 12 Jan 2004 19:20:33 -0000 1.14.2.1 --- itemtypes.tmpl 6 Feb 2004 14:12:27 -0000 1.14.2.2 *************** *** 81,90 **** ! ! --- 81,99 ---- ! ! *************** *** 157,161 **** --- 166,170 ---- Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** koha2marclinks.tmpl 9 Dec 2003 10:29:01 -0000 1.9 --- koha2marclinks.tmpl 6 Feb 2004 14:12:27 -0000 1.9.2.1 *************** *** 164,168 ****
    Category DescriptionEnrollment periodEnrollment fee Upper Age Limit Age Required Fine OverdueIssue limit Reserve YesNo ! Yes ! ! No ! ! Fee OverdueIssue Limit Reserve Fee OverdueIssue limit Reserve
    EditDelete
    EditDelete
    Not for loanchecked value=1> (if checked, no item of this type can be issued. ! If not checked, every item of this type can be issued unless notforloan is set for a specific item)
    Loan length (meaningful only if not for loan is not set)
    Not for loan ! ! ! ! ! ! if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item !
    Loan length ! ! meaningful only if not for loan is not set !
    ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
    ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0>
    ! --- 164,168 ----
    koha field ? Tag Subfield
    ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -C2 -r1.23.2.1 -r1.23.2.2 *** marc_subfields_structure.tmpl 20 Jan 2004 10:23:30 -0000 1.23.2.1 --- marc_subfields_structure.tmpl 6 Feb 2004 14:12:27 -0000 1.23.2.2 *************** *** 68,75 **** ! MARC subfield structure admin for !

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit".

    !

    The column Koha field shows that the subfield is linked with a "Koha field". Koha can manage a MARC interface, or a Koha interface. This link ensures that ! both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    Koha field ? Tag Subfield
    --- 68,74 ---- !

    MARC subfield structure admin for

    !

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    !

    The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    *************** *** 77,81 **** ! --- 76,80 ---- ! Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** printers.tmpl 9 Dec 2003 10:29:01 -0000 1.8 --- printers.tmpl 6 Feb 2004 14:12:27 -0000 1.8.2.1 *************** *** 195,199 ****
    !
    --- 195,199 ----
    !
    Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -r1.17.2.1 -r1.17.2.2 *** thesaurus.tmpl 26 Jan 2004 10:46:35 -0000 1.17.2.1 --- thesaurus.tmpl 6 Feb 2004 14:12:27 -0000 1.17.2.2 *************** *** 99,103 ****

    Manages thesaurus and authorities files.

      ! Dig: see data dependent one this one
      Related: see other forms of this authority entry

    --- 99,103 ----

    Manages thesaurus and authorities files.

      ! Dig: see data depending of this one
      Related: see other forms of this authority entry

    *************** *** 125,129 **** ! --- 125,129 ---- ! Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** z3950servers.tmpl 9 Dec 2003 10:29:02 -0000 1.11 --- z3950servers.tmpl 6 Feb 2004 14:12:27 -0000 1.11.2.1 *************** *** 74,78 ****

    Modify Z39.50 Server

    !

    Add Z39.50 Server

    --- 74,78 ----

    Modify Z39.50 Server

    !

    Add Z39.50 server

    *************** *** 280,284 ****
    !
    --- 280,284 ----
    !
    From tipaul at users.sourceforge.net Fri Feb 6 15:13:03 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:13:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc search.tmpl,1.9.2.2,1.9.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8704/koha-tmpl/intranet-tmpl/default/en/search.marc Modified Files: Tag: rel_2_0 search.tmpl Log Message: template fixes for translation Index: search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -r1.9.2.2 -r1.9.2.3 *** search.tmpl 26 Jan 2004 10:46:35 -0000 1.9.2.2 --- search.tmpl 6 Feb 2004 14:12:45 -0000 1.9.2.3 *************** *** 5,9 **** ! MARC Search
    --- 5,9 ---- ! MARC search
    *************** *** 14,25 **** "> !
    Subfield Libkoha field ? Rep ? Mand ?Subfield LibKoha field ? Rep ? Mand ? Dig Related ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> Dig   Related ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! !
    		HELP :
    --- 14,25 ---- "> ! ! ! ! --- 28,33 ---- !
    		HELP :
    *************** *** 28,32 ****
    ! From tipaul at users.sourceforge.net Fri Feb 6 15:14:02 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:14:02 -0800 Subject: [Koha-cvs] CVS: koha/acqui order.pl,1.9,1.9.2.1 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8988/acqui Modified Files: Tag: rel_2_0 order.pl Log Message: managing active/inactive suppliers. user can't create an order on an inactive supplier Index: order.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/order.pl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** order.pl 8 Jul 2003 16:20:15 -0000 1.9 --- order.pl 6 Feb 2004 14:13:59 -0000 1.9.2.1 *************** *** 64,67 **** --- 64,68 ---- $line{id} =$suppliers[$i]->{'id'}; $line{name} = $suppliers[$i]->{'name'}; + $line{active} = $suppliers[$i]->{'active'}; $line{total} = $orders->[0]->{'count(*)'}; $line{authorisedby} = $orders->[0]->{'authorisedby'}; From tipaul at users.sourceforge.net Fri Feb 6 15:15:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:15:10 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.32.2.4,1.32.2.5 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9271/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.pl Log Message: indicators are back... they were stored but now shown on screen Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.32.2.4 retrieving revision 1.32.2.5 diff -C2 -r1.32.2.4 -r1.32.2.5 *** addbiblio.pl 26 Jan 2004 10:34:53 -0000 1.32.2.4 --- addbiblio.pl 6 Feb 2004 14:14:55 -0000 1.32.2.5 *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $indicator; $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 240,244 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); From tipaul at users.sourceforge.net Fri Feb 6 15:16:57 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:16:57 -0800 Subject: [Koha-cvs] CVS: koha/C4 BookShelves.pm,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9794/C4 Modified Files: Tag: rel_2_0 BookShelves.pm Log Message: fixing bugs in bookshelves management. Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** BookShelves.pm 15 Dec 2003 10:57:08 -0000 1.11 --- BookShelves.pm 6 Feb 2004 14:16:55 -0000 1.11.2.1 *************** *** 145,163 **** #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! my $sth=$dbh->prepare("select * from shelfcontents ! where shelfnumber=? and itemnumber=?"); ! ! $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents ! (shelfnumber, itemnumber, flags) values (?, ?, 0)"); - # FIXME - The default for 'flags' is NULL. - # Why set it to 0? $sth->execute($shelfnumber, $itemnumber); ! } } --- 145,159 ---- #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! return unless $itemnumber; ! my $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); ! $sth->execute($shelfnumber, $itemnumber); ! } } *************** *** 244,247 **** --- 240,246 ---- # # $Log$ + # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.11 2003/12/15 10:57:08 slef # DBI call fix for bug 662 From tipaul at users.sourceforge.net Fri Feb 6 15:15:58 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:15:58 -0800 Subject: [Koha-cvs] CVS: koha/C4 Authorities.pm,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9512/C4 Modified Files: Tag: rel_2_0 Authorities.pm Log Message: modifying order (mysql auto sort by relevance) Index: Authorities.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Authorities.pm,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** Authorities.pm 26 Jan 2004 10:36:42 -0000 1.7.2.1 --- Authorities.pm 6 Feb 2004 14:15:56 -0000 1.7.2.2 *************** *** 193,199 **** } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " order by category,freelib limit ?,?"; push(@bind,$offset,($pagesize*4)); ! # warn "q : $query"; my $sth=$dbh->prepare($query); $sth->execute(@bind); --- 193,199 ---- } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " limit ?,?"; push(@bind,$offset,($pagesize*4)); ! warn "q : $query". at bind; my $sth=$dbh->prepare($query); $sth->execute(@bind); From tipaul at users.sourceforge.net Fri Feb 6 15:22:25 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:22:25 -0800 Subject: [Koha-cvs] CVS: koha shelves.pl,1.12,1.12.2.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11270 Modified Files: Tag: rel_2_0 shelves.pl Log Message: fixing bugs in bookshelves management. Index: shelves.pl =================================================================== RCS file: /cvsroot/koha/koha/shelves.pl,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** shelves.pl 5 Feb 2003 10:04:14 -0000 1.12 --- shelves.pl 6 Feb 2004 14:22:19 -0000 1.12.2.1 *************** *** 5,10 **** # $Header$ # - - # Copyright 2000-2002 Katipo Communications # --- 5,8 ---- *************** *** 36,40 **** my $env; my $query = new CGI; - #print $query->header(-cookie => $cookie); my $headerbackgroundcolor='#663266'; my $circbackgroundcolor='#555555'; --- 34,37 ---- *************** *** 45,83 **** = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {parameters => 1}, ! }); ! #print startpage(); ! #print startmenu('catalogue'); ! #print "

    Logged in as: $loggedinuser [Log Out]

    \n"; ! ! ! my ($shelflist) = GetShelfList(); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); } - } } SWITCH: { ! $template->param({ loggedinuser => $loggedinuser, ! viewshelf => $query->param('viewshelf'), ! shelves => $query->param('shelves'), ! headerbackgroundcolor => $headerbackgroundcolor, ! circbackgroundcolor => $circbackgroundcolor }); ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 42,77 ---- = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {catalogue => 1}, ! }); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); ! } } } + my ($shelflist) = GetShelfList(); + $template->param({ loggedinuser => $loggedinuser, + headerbackgroundcolor => $headerbackgroundcolor, + circbackgroundcolor => $circbackgroundcolor }); SWITCH: { ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! } ! ! ($shelflist) = GetShelfList(); # rebuild shelflist in case a shelf has been added ! ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 87,106 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); - } - $template->param(shelvesloop => \@shelvesloop); } output_html_with_http_headers $query, $cookie, $template->output; - sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); } - } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { --- 81,98 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); } + $template->param(shelvesloop => \@shelvesloop); output_html_with_http_headers $query, $cookie, $template->output; sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); ! } } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { *************** *** 114,123 **** #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 106,115 ---- #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 127,143 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop); } - - sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 119,135 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop, ! shelves => 1, ! ); } sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 148,162 **** $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop); ! $template->param( shelfname => $shelflist->{$shelfnumber}->{'shelfname'}); ! $template->param( shelfnumber => $shelfnumber); } - #print endpage(); - #print endmenu('catalogue'); - # # $Log$ # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains --- 140,156 ---- $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop, ! shelfname => $shelflist->{$shelfnumber}->{'shelfname'}, ! shelfnumber => $shelfnumber, ! viewshelf => $query->param('viewshelf'), ! ); } # # $Log$ + # Revision 1.12.2.1 2004/02/06 14:22:19 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains From tipaul at users.sourceforge.net Fri Feb 6 15:21:56 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 06 Feb 2004 06:21:56 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.85.2.3,1.85.2.4 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11122/C4 Modified Files: Tag: rel_2_0 Search.pm Log Message: bugfix for subject search. Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85.2.3 retrieving revision 1.85.2.4 diff -C2 -r1.85.2.3 -r1.85.2.4 *** Search.pm 26 Jan 2004 10:39:16 -0000 1.85.2.3 --- Search.pm 6 Feb 2004 14:21:54 -0000 1.85.2.4 *************** *** 1146,1150 **** } else { if ($type eq 'subject'){ ! $query .= "group by subject order by subject "; } } --- 1146,1150 ---- } else { if ($type eq 'subject'){ ! $query .= "order by subject group by subject "; } } From acli at users.sourceforge.net Tue Feb 10 01:43:24 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 16:43:24 -0800 Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.45,1.46 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4553 Modified Files: Output.pm Log Message: This allows the user to type zh_TW and still get Chinese from the zh-TW directory. Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** Output.pm 2 Dec 2003 22:13:25 -0000 1.45 --- Output.pm 10 Feb 2004 00:43:21 -0000 1.46 *************** *** 130,137 **** foreach my $th (@themes) { foreach my $la (@languages) { ! if (-e "$htdocs/$th/$la/$tmpl") { ! $theme = $th; ! $lang = $la; ! last THEME; } } --- 130,141 ---- foreach my $th (@themes) { foreach my $la (@languages) { ! for (my $pass = 1; $pass <= 2; $pass += 1) { ! $la =~ s/([-_])/ $1 eq '-'? '_': '-' /eg if $pass == 2; ! if (-e "$htdocs/$th/$la/$tmpl") { ! $theme = $th; ! $lang = $la; ! last THEME; ! } ! last unless $la =~ /[-_]/; } } From acli at users.sourceforge.net Tue Feb 10 00:34:10 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 15:34:10 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21182 Modified Files: tmpl_process.pl Log Message: Minor spelling correction. Don't proceed if the user specified an unknown option. Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** tmpl_process.pl 9 Dec 2003 10:26:51 -0000 1.5 --- tmpl_process.pl 9 Feb 2004 23:34:08 -0000 1.6 *************** *** 19,23 **** 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help); help() if $help; --- 19,24 ---- 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help, ! ) || (usage(), exit(-1)); help() if $help; *************** *** 42,46 **** if( !(-d $in_files[0]) && !(-f $in_files[0])) { ! usage("Unknow input. Input must a file or a directory. (Symbolic links are not supported for the moment)."); } elsif( -d $in_files[0] ) --- 43,47 ---- if( !(-d $in_files[0]) && !(-f $in_files[0])) { ! usage("Unknown input. Input must a file or a directory. (Symbolic links are not supported for the moment.)"); } elsif( -d $in_files[0] ) From acli at users.sourceforge.net Tue Feb 10 01:58:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 16:58:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8108/parameters Modified Files: admin-home.tmpl Log Message: Spelling mistake Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** admin-home.tmpl 9 Dec 2003 13:46:28 -0000 1.25 --- admin-home.tmpl 10 Feb 2004 00:58:49 -0000 1.26 *************** *** 11,15 ****     ! --- 11,15 ---- ! From acli at users.sourceforge.net Mon Feb 9 23:36:35 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 14:36:35 -0800 Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.70,1.71 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4855/misc Modified Files: Install.pm Log Message: Fix of bug 711, "No message named WhereisMySQL in Install.pm". Added defined() check for "Use of uninitialized value in -e at Install.pm line 2085, line 32." Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -r1.70 -r1.71 *** Install.pm 22 Dec 2003 19:16:58 -0000 1.70 --- Install.pm 9 Feb 2004 22:36:32 -0000 1.71 *************** *** 998,1002 **** if (!$mysqldir){ for (;;) { ! $mysqldir = showmessage(getmessage('WhereisMySQL'),'free'); last if -f "$mysqldir/bin/mysqladmin"; } --- 998,1002 ---- if (!$mysqldir){ for (;;) { ! $mysqldir = showmessage(getmessage('WhereIsMySQL'),'free'); last if -f "$mysqldir/bin/mysqladmin"; } *************** *** 2080,2087 **** sub restoremycnf { ! if (-e $mycnf) { unlink($mycnf); } ! if (-e $mytmpcnf) { rename $mytmpcnf,$mycnf; } --- 2080,2087 ---- sub restoremycnf { ! if (defined $mycnf && -e $mycnf) { unlink($mycnf); } ! if (defined $mytmpcnf && -e $mytmpcnf) { rename $mytmpcnf,$mycnf; } From acli at users.sourceforge.net Tue Feb 10 03:53:24 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 18:53:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28881/includes Modified Files: common-style.css Log Message: We can't use A.home, A.about, etc. for Chinese, otherwise the padding will cause the links to become very ugly; this is better. (It is probably better for other translations as well...) Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** common-style.css 16 Jul 2003 06:37:46 -0000 1.1 --- common-style.css 10 Feb 2004 02:53:09 -0000 1.2 *************** *** 39,51 **** } ! a.home { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.home:hover { background-color: #339933; color: #000000; --- 39,57 ---- } ! /* ! * We can't use a.home, etc. for Chinese. ! * Otherwise the screen will be extremely ugly because of the padding ! */ ! td.home { ! padding:4px; ! } ! td.home a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.home a:hover { background-color: #339933; color: #000000; *************** *** 55,68 **** } ! a.catalogue { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; margin:0; } ! a.catalogue:hover { font-weight: normal; text-decoration: none; --- 61,76 ---- } ! td.catalogue { ! padding:4px; ! } ! td.catalogue a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; margin:0; } ! td.catalogue a:hover { font-weight: normal; text-decoration: none; *************** *** 73,85 **** } ! a.members { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.members:hover { background-color: #86c268; color: #000000; --- 81,95 ---- } ! td.members { ! padding:4px; ! } ! td.members a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.members a:hover { background-color: #86c268; color: #000000; *************** *** 88,100 **** } ! a.acquisition { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.acquisition:hover { background-color: #ffdf61; color: #000000; --- 98,112 ---- } ! td.acquisition { ! padding:4px; ! } ! td.acquisition a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.acquisition a:hover { background-color: #ffdf61; color: #000000; *************** *** 103,115 **** } ! a.reports { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.reports:hover { background-color: #6b7cbe; color: #000000; --- 115,129 ---- } ! td.reports { ! padding:4px; ! } ! td.reports a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.reports a:hover { background-color: #6b7cbe; color: #000000; *************** *** 118,130 **** } ! a.circulation { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.circulation:hover { background-color: #be6170; color: #000000; --- 132,146 ---- } ! td.circulation { ! padding:4px; ! } ! td.circulation a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.circulation a:hover { background-color: #be6170; color: #000000; *************** *** 133,145 **** } ! a.parameters { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.parameters:hover { background-color: #86c268; color: #000000; --- 149,163 ---- } ! td.parameters { ! padding:4px; ! } ! td.parameters a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.parameters a:hover { background-color: #86c268; color: #000000; *************** *** 147,159 **** font-weight: bold; } ! a.about { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; - padding:4px; font-weight: bold; } ! a.about:hover { background-color: #86c268; color: #000000; --- 165,180 ---- font-weight: bold; } ! ! td.about { ! padding:4px; ! } ! td.about a { font-weight: normal; text-decoration: none; cursor: hand; color:#777777; font-weight: bold; } ! td.about a:hover { background-color: #86c268; color: #000000; From acli at users.sourceforge.net Tue Feb 10 03:55:03 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 18:55:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29269/includes Modified Files: common-style.css Log Message: Sync to en/include/common-style.css Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** common-style.css 10 Feb 2004 02:53:09 -0000 1.2 --- common-style.css 10 Feb 2004 02:55:01 -0000 1.3 *************** *** 14,17 **** --- 14,21 ---- } + #problem { + color: red; + font-weight:bold; + } #menubar { border-top:1px solid #666666; *************** *** 29,32 **** --- 33,47 ---- cursor: hand; color:#777777; + background-color:#EEEEEE; + padding:4px; + font-weight: bold; + margin:0; + } + a.submenu2 { + font-weight: normal; + text-decoration: none; + cursor: hand; + color:#777777; + background-color:#CCCCCC; padding:4px; font-weight: bold; From acli at users.sourceforge.net Tue Feb 10 04:00:39 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:00:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30007/includes Modified Files: parameters-top.inc Log Message: Changed DTD declaration so that Mozilla will use standards mode for this. Use more standard translation for "About" Minor updates Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** parameters-top.inc 16 Jul 2003 08:10:33 -0000 1.3 --- parameters-top.inc 10 Feb 2004 03:00:37 -0000 1.4 *************** *** 1,3 **** ! --- 1,3 ---- ! *************** *** 36,66 **** --- 60,64 ---- *************** *** 86,95 **** --- 70,79 ---- From acli at users.sourceforge.net Tue Feb 10 04:00:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:00:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-bottom.inc,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30203/includes Modified Files: parameters-bottom.inc Log Message: Use more standard translation for "About" Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** parameters-bottom.inc 16 Jul 2003 04:52:13 -0000 1.2 --- parameters-bottom.inc 10 Feb 2004 03:00:50 -0000 1.3 *************** *** 14,18 **** ?????C?L || ?t?????? || ! ????Koha || Help --- 14,18 ---- ?????C?L || ?t?????? || ! ????Koha || Help From acli at users.sourceforge.net Tue Feb 10 04:01:02 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:01:02 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes acquisitions-top.inc,1.1,1.2 cat-top.inc,1.1,1.2 circulation-top.inc,1.1,1.2 issues-top.inc,1.1,1.2 members-top.inc,1.1,1.2 opac-top.inc,1.1,1.2 reports-top.inc,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30227/includes Modified Files: acquisitions-top.inc cat-top.inc circulation-top.inc issues-top.inc members-top.inc opac-top.inc reports-top.inc Log Message: Changed DTD declaration so that Mozilla will use standards mode for this. Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/acquisitions-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquisitions-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- acquisitions-top.inc 10 Feb 2004 03:00:59 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/cat-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cat-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- cat-top.inc 10 Feb 2004 03:00:59 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/circulation-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- circulation-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/issues-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** issues-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- issues-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: members-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/members-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** members-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- members-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/opac-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- opac-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/reports-top.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** reports-top.inc 2 Feb 2003 04:56:46 -0000 1.1 --- reports-top.inc 10 Feb 2004 03:01:00 -0000 1.2 *************** *** 1,3 **** ! --- 1,3 ---- ! From acli at users.sourceforge.net Tue Feb 10 04:01:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:01:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30355/parameters Modified Files: admin-home.tmpl Log Message: Sync to en Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** admin-home.tmpl 6 Feb 2003 06:37:47 -0000 1.3 --- admin-home.tmpl 10 Feb 2004 03:01:36 -0000 1.4 *************** *** 1,87 **** - - -

    ?z???e?n?J??: [?n?X]

    - -

    ?n?J Koha

    -
    ! Koha???t???]?w
    !
    Library branchesThe differents branches you manage with this Koha server.
     
    Library branchesThe different branches you manage with this Koha server.
     
    !
    ?t??????
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ?????????]?w
    ?]?????O?U???]????????
    ?]?F?w??the budgets allowed to differents book funds.
    book fundsthe differents book funds.
    ?e?\???]?w?e?\???????O?????????e?\???C ! ?b???????????c???]?w???A?i???w?Y???????u?????Y???u?e?\???v?A?O???J???????i?H???????~?????[???K
    ThesaurusThesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
    ???????? (MARC) ?????]?w
    ?w?q?????????????c?????????????c?G????????
    ?w?q?????????Mkoha?????w?????s???w?qKoha?????w?M?????????????w???????Y?C???G?????u?w?q?????????????c?v?\???]?i?????o?I?A?????o???u?????s???|???@???C
    ???????????????c???????????????c???w?q???S?????P?????w???????`???@???Y?????~?C?B?z?u?????????e?A???????o?????@?????I
    ???L????
    ???]?]?w?o?M Koha ???A?????????????]?@??
    ???????O?]?w???P?????????O
    ?????]?w?????????????????f??
    ???L???]?w???L?? (UNIX ???|) ?]?w
    stopword?d???????????????r??
    Z39.50 ???A???????d?????????????????U???A??
    ?t?????n???L?v?T?t???B?@?????n?]?w
    ! !
    ?????u??
    ???X
    MARC biblio export ?H???????????X
    --- 1,123 ----
    !

    ?]?w

    ! !
    ?t??????
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + ! ! + ! ! + ! + ! ! ! ! + ! ! + + + + + + + ! + + ! ! + ! + ! + !
    ?nKoha?????`?B?@?A???z?????????????U?C???U???]?w
    ?]?O?]?w?o??Koha???A?????t?d???U?]
     
    book fund???H???m???????U??????
     
    ?f?????v?]?w???v
     
    ?]?????O?]?w?U????????????????
     
    ???????O?]?w??????????
     
    ?@???]?w?U?????????X?U?????????????U???@??
     
    ?e?\???]?w?e?\???????O?????????e?\???w?w?????????????????????A?e?\???i?H???????????????????????~?H?????????K
     
    ThesaurusManagement of thesaurus and authorities files.
     
    ???????????????c?]?w?????????????????c (????????)
     
    ?s??Koha???????????????w?w?qKoha?????w?M?????????????w???????Y?C???G?u???u???????????????c?v?\???]?i?????o???B?J?A?????o???u?????s???|?????C
     
    ???????????????c???????????????c???w?q???S?????P?????w???????`???@???Y?????~?C?B?z?u?????????e?A???????o?????@?????I
     
    ???L?U??????
     
    ???L???]?w???L?? (UNIX ???|)
     
    stopword?]?w?d?????????????r??
     
    Z39.50 ???A???]?w?d?????????????????????????A??
     
    ?t?????n?]?w?t?????n
    ! !
    ?????u??
    + + + + + + + + +
    ???X
    MARC biblio export ?H???????????X
    ???J
    ?W???????????O?????uBreeding Farm?vThe breeding farm is a table where imported MARC records are + stored.
    + A MARC record is stored in the breeding farm as long as + you have no item. When you type the ISBN or title of a biblio, it's searched for + in the breeding farm. + If it is found, the biblio is added to Koha active table + and removed from the breeding farm.
    +
    From acli at users.sourceforge.net Tue Feb 10 04:08:02 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:08:02 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31600/parameters Modified Files: admin-home.tmpl Log Message: Minor improvements Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** admin-home.tmpl 10 Feb 2004 03:01:36 -0000 1.4 --- admin-home.tmpl 10 Feb 2004 03:08:00 -0000 1.5 *************** *** 9,22 **** ! ! ! --- 9,22 ----
    ?nKoha?????`?B?@?A???z?????????????U?C???U???]?w
    ?]?O?]?w?o??Koha???A?????t?d???U?]
     
    book fund???H???m???????U??????
     
    ! ! ! *************** *** 38,42 **** ! --- 38,42 ---- ! *************** *** 47,52 **** ! ! --- 47,52 ---- ! ! *************** *** 110,115 **** ! ! ! ! ! ! --- 128,133 ---- ! ! *************** *** 135,142 ****
    ?nKoha?????`?B?@?A???z???????????n?U?C???U???]?w
    ?]?O?]?w?]?w?o??Koha???A?????t?d???U?]??????
     
    book fund?]?w???H???m???????U??????
     
    ?@???]?w?U?????????X?U?????????????U???@??
     
    ?@???]?w?]?w?U?????????X?U?????????????U???@??
     
     
    ThesaurusManagement of thesaurus and authorities files.
     
     
    ThesaurusManagement of thesaurus and authorities files.
     
    ?W???????????O?????uBreeding Farm?vThe breeding farm is a table where imported MARC records are stored.
    A MARC record is stored in the breeding farm as long as --- 110,115 ----
    ?W???????????O?????uBreeding Farm?vThe breeding farm is a table where imported MARC records are stored.
    A MARC record is stored in the breeding farm as long as From acli at users.sourceforge.net Tue Feb 10 04:13:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:13:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.26,1.27 systempreferences.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32491/parameters Modified Files: admin-home.tmpl systempreferences.tmpl Log Message: Various pedantic SGML syntax corrections (e.g., must contain a multiple of 4 hyphens) Inserted some blank rows in admin-home for visual consistency. Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** admin-home.tmpl 10 Feb 2004 00:58:49 -0000 1.26 --- admin-home.tmpl 10 Feb 2004 03:13:41 -0000 1.27 *************** *** 2,12 ****

    Parameters


    !
    System parameters
    ! --- 2,14 ----

    Parameters


    !
    Fill those tables in the order they appear to get a working Koha
    Library branches
    System parameters
    ! ! + *************** *** 18,21 **** --- 20,24 ---- + *************** *** 27,34 **** --- 30,39 ---- + + *************** *** 40,68 **** --- 45,84 ---- + + + + + + + + + + + *************** *** 75,90 ****
    Fill those tables in the order they appear to get a working Koha
    Library branchesBook fund administration. Remember to edit your book funds before you start editing the budgets.
     
    CurrenciesDefine item types.
     
    Borrower categories Define the categories of borrowers.
     
    ChargesDefine categories and authorised values for them. Authorised values are used in MARC form to limit/help editing MARC biblios.
     
    Thesaurus Management of thesaurus and authorities files.
     
    MARC tag structure MARC structure: tags then subfields.
     
    Links Koha - MARC DB Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.
     
    MARC Check Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!
     
    Various parameters
     
    Printers Printers (UNIX paths).
     
    Stop words Words deleted during searches.
     
    Z39.50 Servers
    !
    Tools
    ! --- 91,110 ----
    Export
    MARC biblio export Exporting in MARC format.
    Import
    Upload MARC records in Breeding Farm
    !
    Tools
    ! ! + + + Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** systempreferences.tmpl 9 Dec 2003 10:29:02 -0000 1.18 --- systempreferences.tmpl 10 Feb 2004 03:13:41 -0000 1.19 *************** *** 56,60 **** !

    Modify a system preference

    --- 56,60 ---- !

    Modify a system preference

    *************** *** 78,82 **** ! Data recorded --- 78,82 ---- ! Data recorded *************** *** 86,90 **** !
    Export
    MARC biblio export Exporting in MARC format.
    Import
    Upload MARC records in Breeding Farm
    --- 86,90 ---- !
    *************** *** 101,105 **** ! Data deleted --- 101,105 ---- ! Data deleted *************** *** 108,112 **** !

    System preferences admin

    --- 108,112 ---- !

    System preferences admin

    From acli at users.sourceforge.net Tue Feb 10 04:13:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 19:13:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes parameters-top.inc,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32491/includes Modified Files: parameters-top.inc Log Message: Various pedantic SGML syntax corrections (e.g., must contain a multiple of 4 hyphens) Inserted some blank rows in admin-home for visual consistency. Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** parameters-top.inc 9 Dec 2003 10:29:04 -0000 1.18 --- parameters-top.inc 10 Feb 2004 03:13:41 -0000 1.19 *************** *** 35,39 **** !
    Value
    ?T?w?n???????H
    *************** *** 102,106 **** ! ???\?R??????
    --- 102,106 ---- ! ???\???????? *************** *** 128,133 ****
    		">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ????    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ?R??
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ????    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ????
    ! ! !
    --- 135,142 ----
    ! ! !
    From acli at users.sourceforge.net Tue Feb 10 05:57:22 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:57:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7,1.7.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19110 Modified Files: Tag: rel_2_0 about-top.inc Log Message: Spurious attribute in BODY removed Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** about-top.inc 9 Dec 2003 10:29:03 -0000 1.7 --- about-top.inc 10 Feb 2004 04:57:12 -0000 1.7.2.1 *************** *** 7,11 **** ! --- 7,11 ---- ! From acli at users.sourceforge.net Tue Feb 10 05:57:30 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:57:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19203/includes Modified Files: about-top.inc Log Message: Spurious attribute in BODY removed Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** about-top.inc 9 Dec 2003 10:29:03 -0000 1.7 --- about-top.inc 10 Feb 2004 04:57:27 -0000 1.8 *************** *** 7,11 **** ! --- 7,11 ---- ! From acli at users.sourceforge.net Tue Feb 10 05:59:04 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:59:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19434 Modified Files: Tag: rel_2_0 about-top.inc Log Message: Pedantic SGML syntax correction Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** about-top.inc 10 Feb 2004 04:57:12 -0000 1.7.2.1 --- about-top.inc 10 Feb 2004 04:59:01 -0000 1.7.2.2 *************** *** 33,37 **** ! !
    --- 33,37 ----
    !
    From acli at users.sourceforge.net Tue Feb 10 05:59:12 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 20:59:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes about-top.inc,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19568/includes Modified Files: about-top.inc Log Message: Pedantic SGML syntax correction Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** about-top.inc 10 Feb 2004 04:57:27 -0000 1.8 --- about-top.inc 10 Feb 2004 04:59:09 -0000 1.9 *************** *** 33,37 ****
    ! ! ! --- 128,133 ---- ! ! *************** *** 135,142 ****
    --- 33,37 ----
    ! !
    From acli at users.sourceforge.net Tue Feb 10 06:52:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:52:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes common-style.css,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27584/includes Modified Files: common-style.css Log Message: This makes the fonts look more like the English version Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** common-style.css 10 Feb 2004 02:55:01 -0000 1.3 --- common-style.css 10 Feb 2004 05:51:58 -0000 1.4 *************** *** 197,198 **** --- 197,210 ---- font-weight: bold; } + + /* Chinese-specific stuff below */ + *[lang=en], *[lang=fr], *[lang=de], *[lang=it], + *[lang=mi], *[lang=nl], *[lang=pl], + *.en { + font-family: Helvetica, Arial, sans-serif; + } + + body { + font-family: "Apple LiGothic Medium", "SimHei", "MS Gothic", "MS Hei", sans-serif; + } + From acli at users.sourceforge.net Tue Feb 10 06:56:35 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:56:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW about.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28094 Added Files: about.tmpl Log Message: New "About" templates from en Minor visual improvements to parameters-{top,bottom}.inc --- NEW FILE ---

    ?????o??Koha?????????? (?H?K???i???~?A?H?????L?????????T)?G

    Koha?????G
    ???@?t?????? (uname -a)?G
    Perl?????G
    MySQL?????G
    Apache?????G
    ?????G

    ?D?n?H??

    ?u?@?? Pat Eyler
    2.0???X???D?????????????}?o?? Paul Poulain
    ?????????\?????? Joshua Ferraro ?? Nelsonville ?????????]
    ?????????????}?o???BVirtual Bookshelf?????BKohaCD Steve Tonnesen
    ???????s?? Nicholas Rosasco?BMike Hansen
    ?~?????z???w??/?????{???s?g?? MJ Ray ?? Turo Technology LLP
    ?k?????? Nicolas Morin
    		 Horowhenua Library Trust
    ?????]?`?? Rosalie Blake
    Jo Ransom
    Katipo Communications
    ?`?g?z?????????z?? Rachel Hamilton-Williams
    1.2???X???D?? Chris Cormack
    ?H???GSimon Blake?B?B?@?g?zAmanda Atkins?BOlwen Williams?BFinlay Thompson?BGynn Lomax?BRichard Anderson?BJeremy Blake?BRebecca Holden?BOlive T. Canine

    ???U

    Adam Thick
    Andrew Hooper
    Al Banks
    Ambrose Li
    Andrew Arensburger
    Benedykt P. Barszcz (2.0???i????????)
    Brig C. McCoy
    Daniel Holth
    David Strainchamps
    Dorian Meid
    		 Ed Summers
    Florian Bischof
    Francisco M. Marzoa Alonso
    Glen Stewart
    Henri-Damien Laurent
    Jérome Vizcaino (ESIEE???|)
    Kip DeGraaf
    Marco Gaiarin
    Md. Aftabuddin
    Michaes Herman
    		 Michel Lerenard (ESIEE???|)
    Mike Johnson
    Mike Mylonas
    Pierre Cauchois (ESIEE???|)
    Pawel Skuza (1.2???i????????)
    Regula Sebastiao
    Roger Buck
    Ron Wickersham
    Sebastiaan Durand
    From acli at users.sourceforge.net Tue Feb 10 06:56:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:56:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,NONE,1.1 about-top.inc,NONE,1.1 parameters-bottom.inc,1.3,1.4 parameters-top.inc,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28094/includes Modified Files: parameters-bottom.inc parameters-top.inc Added Files: about-bottom.inc about-top.inc Log Message: New "About" templates from en Minor visual improvements to parameters-{top,bottom}.inc --- NEW FILE ---

     

    ???^?D?? || ?]???d?? || ?????b?? || ???????m || ?y?q?A?? || ?????C?L || ?t?????? || ????Koha || ?u?W????
    --- NEW FILE --- KOHA: INTRANET: Parameters /includes/common-style.css">

    ???????????G [?n?X]

    ?n?JKoha

    Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** parameters-bottom.inc 10 Feb 2004 03:00:50 -0000 1.3 --- parameters-bottom.inc 10 Feb 2004 05:56:33 -0000 1.4 *************** *** 15,19 **** ?t?????? || ????Koha || ! Help --- 15,19 ---- ?t?????? || ????Koha || ! ?u?W???? Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** parameters-top.inc 10 Feb 2004 03:19:52 -0000 1.5 --- parameters-top.inc 10 Feb 2004 05:56:33 -0000 1.6 *************** *** 7,15 **** /includes/common-style.css"> - + + *************** *** 87,91 ****
    !

    ???????????G [?n?X]

    ?n?JKoha

    --- 90,94 ----
    !

    ???????????G [?n?X]

    ?n?JKoha

    From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters systempreferences.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511/parameters Modified Files: Tag: rel_2_0 systempreferences.tmpl Log Message: Backport from trunk Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/systempreferences.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** systempreferences.tmpl 10 Feb 2004 04:22:01 -0000 1.3.2.1 --- systempreferences.tmpl 10 Feb 2004 05:57:14 -0000 1.3.2.2 *************** *** 58,62 **** !

    ?????t?????n

    ?s?W?t?????n

    --- 58,62 ---- !

    ?????t?????n

    ?s?W?t?????n

    *************** *** 94,98 ****
    !
    Value
    ?u???n?R???H
    --- 94,98 ----
    Value
    ?T?w?n???????H
    *************** *** 102,106 **** ! ???\?R??????
    --- 102,106 ---- ! ???\???????? *************** *** 128,133 ****
    		">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ????    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ?R??
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ????    		">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ????
    ! ! !
    --- 135,142 ----
    ! ! !
    From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW about.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511 Added Files: Tag: rel_2_0 about.tmpl Log Message: Backport from trunk --- NEW FILE ---

    ?????o??Koha?????????? (?H?K???i???~?A?H?????L?????????T)?G

    Koha?????G
    ???@?t?????? (uname -a)?G
    Perl?????G
    MySQL?????G
    Apache?????G
    ?????G

    ?D?n?H??

    ?u?@?? Pat Eyler
    2.0???X???D?????????????}?o?? Paul Poulain
    ?????????\?????? Joshua Ferraro ?? Nelsonville ?????????]
    ?????????????}?o???BVirtual Bookshelf?????BKohaCD Steve Tonnesen
    ???????s?? Nicholas Rosasco?BMike Hansen
    ?~?????z???w??/?????{???s?g?? MJ Ray ?? Turo Technology LLP
    ?k?????? Nicolas Morin
    		 Horowhenua Library Trust
    ?????]?`?? Rosalie Blake
    Jo Ransom
    Katipo Communications
    ?`?g?z?????????z?? Rachel Hamilton-Williams
    1.2???X???D?? Chris Cormack
    ?H???GSimon Blake?B?B?@?g?zAmanda Atkins?BOlwen Williams?BFinlay Thompson?BGynn Lomax?BRichard Anderson?BJeremy Blake?BRebecca Holden?BOlive T. Canine

    ???U

    Adam Thick
    Andrew Hooper
    Al Banks
    Ambrose Li
    Andrew Arensburger
    Benedykt P. Barszcz (2.0???i????????)
    Brig C. McCoy
    Daniel Holth
    David Strainchamps
    Dorian Meid
    		 Ed Summers
    Florian Bischof
    Francisco M. Marzoa Alonso
    Glen Stewart
    Henri-Damien Laurent
    Jérome Vizcaino (ESIEE???|)
    Kip DeGraaf
    Marco Gaiarin
    Md. Aftabuddin
    Michaes Herman
    		 Michel Lerenard (ESIEE???|)
    Mike Johnson
    Mike Mylonas
    Pierre Cauchois (ESIEE???|)
    Pawel Skuza (1.2???i????????)
    Regula Sebastiao
    Roger Buck
    Ron Wickersham
    Sebastiaan Durand
    From acli at users.sourceforge.net Tue Feb 10 06:57:16 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:57:16 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,NONE,1.1.2.1 about-top.inc,NONE,1.1.2.1 common-style.css,1.1.2.1,1.1.2.2 parameters-bottom.inc,1.2.2.1,1.2.2.2 parameters-top.inc,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511/includes Modified Files: Tag: rel_2_0 common-style.css parameters-bottom.inc parameters-top.inc Added Files: Tag: rel_2_0 about-bottom.inc about-top.inc Log Message: Backport from trunk --- NEW FILE ---

     

    ???^?D?? || ?]???d?? || ?????b?? || ???????m || ?y?q?A?? || ?????C?L || ?t?????? || ????Koha || ?u?W????
    --- NEW FILE --- KOHA: INTRANET: Parameters /includes/common-style.css">

    ???????????G [?n?X]

    ?n?JKoha

    Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/common-style.css,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** common-style.css 10 Feb 2004 04:18:48 -0000 1.1.2.1 --- common-style.css 10 Feb 2004 05:57:14 -0000 1.1.2.2 *************** *** 197,198 **** --- 197,210 ---- font-weight: bold; } + + /* Chinese-specific stuff below */ + *[lang=en], *[lang=fr], *[lang=de], *[lang=it], + *[lang=mi], *[lang=nl], *[lang=pl], + *.en { + font-family: Helvetica, Arial, sans-serif; + } + + body { + font-family: "Apple LiGothic Medium", "SimHei", "MS Gothic", "MS Hei", sans-serif; + } + Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** parameters-bottom.inc 10 Feb 2004 04:18:48 -0000 1.2.2.1 --- parameters-bottom.inc 10 Feb 2004 05:57:14 -0000 1.2.2.2 *************** *** 15,19 **** ?t?????? || ????Koha || ! Help --- 15,19 ---- ?t?????? || ????Koha || ! ?u?W???? Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** parameters-top.inc 10 Feb 2004 04:18:48 -0000 1.3.2.1 --- parameters-top.inc 10 Feb 2004 05:57:14 -0000 1.3.2.2 *************** *** 7,15 **** /includes/common-style.css"> - + + *************** *** 87,91 ****
    !

    ???????????G [?n?X]

    ?n?JKoha

    --- 90,94 ----
    !

    ???????????G [?n?X]

    ?n?JKoha

    From acli at users.sourceforge.net Tue Feb 10 06:58:47 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:58:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,1.1,1.2 parameters-bottom.inc,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28725/includes Modified Files: about-bottom.inc parameters-bottom.inc Log Message: Markup error Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-bottom.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** about-bottom.inc 10 Feb 2004 05:56:33 -0000 1.1 --- about-bottom.inc 10 Feb 2004 05:58:45 -0000 1.2 *************** *** 14,18 **** ?????C?L || ?t?????? || ! ????Koha || ?u?W???? --- 14,18 ---- ?????C?L || ?t?????? || ! ????Koha || ?u?W???? Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parameters-bottom.inc 10 Feb 2004 05:56:33 -0000 1.4 --- parameters-bottom.inc 10 Feb 2004 05:58:45 -0000 1.5 *************** *** 14,18 **** ?????C?L || ?t?????? || ! ????Koha || ?u?W???? --- 14,18 ---- ?????C?L || ?t?????? || ! ????Koha || ?u?W???? From acli at users.sourceforge.net Tue Feb 10 06:59:22 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 21:59:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes about-bottom.inc,1.1.2.1,1.1.2.2 parameters-bottom.inc,1.2.2.2,1.2.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28817/includes Modified Files: Tag: rel_2_0 about-bottom.inc parameters-bottom.inc Log Message: Markup errors Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-bottom.inc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** about-bottom.inc 10 Feb 2004 05:57:14 -0000 1.1.2.1 --- about-bottom.inc 10 Feb 2004 05:59:20 -0000 1.1.2.2 *************** *** 14,18 **** ?????C?L || ?t?????? || ! ????Koha || ?u?W???? --- 14,18 ---- ?????C?L || ?t?????? || ! ????Koha || ?u?W???? Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -r1.2.2.2 -r1.2.2.3 *** parameters-bottom.inc 10 Feb 2004 05:57:14 -0000 1.2.2.2 --- parameters-bottom.inc 10 Feb 2004 05:59:20 -0000 1.2.2.3 *************** *** 14,18 **** ?????C?L || ?t?????? || ! ????Koha || ?u?W???? --- 14,18 ---- ?????C?L || ?t?????? || ! ????Koha || ?u?W???? From acli at users.sourceforge.net Tue Feb 10 07:08:37 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 22:08:37 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30242/parameters Modified Files: admin-home.tmpl Log Message: Minor updates Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** admin-home.tmpl 10 Feb 2004 03:08:00 -0000 1.5 --- admin-home.tmpl 10 Feb 2004 06:08:35 -0000 1.6 *************** *** 74,87 ****
    ! ! ! --- 74,87 ---- ! ! ! *************** *** 103,108 **** ! ! --- 103,108 ---- ! ! From acli at users.sourceforge.net Tue Feb 10 07:09:01 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 22:09:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30303/parameters Modified Files: Tag: rel_2_0 admin-home.tmpl Log Message: Backport from trunk Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/admin-home.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** admin-home.tmpl 10 Feb 2004 04:22:01 -0000 1.3.2.1 --- admin-home.tmpl 10 Feb 2004 06:08:59 -0000 1.3.2.2 *************** *** 74,87 **** ! ! ! --- 74,87 ---- ! ! ! *************** *** 103,108 **** ! ! --- 103,108 ---- ! ! From acli at users.sourceforge.net Tue Feb 10 08:07:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:07:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes parameters-top.inc,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6302/includes Modified Files: parameters-top.inc Log Message: SGML syntax corrections Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** parameters-top.inc 10 Feb 2004 03:13:41 -0000 1.19 --- parameters-top.inc 10 Feb 2004 07:07:42 -0000 1.20 *************** *** 5,11 **** KOHA: INTRANET: Parameters /includes/common-style.css"> - - + + From acli at users.sourceforge.net Tue Feb 10 08:33:37 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:33:37 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters branches.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9857/parameters Modified Files: branches.tmpl Log Message: Sync to new en template Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branches.tmpl 10 Feb 2003 07:27:50 -0000 1.6 --- branches.tmpl 10 Feb 2004 07:33:35 -0000 1.7 *************** *** 1,115 **** ! ! !

    Logged in as: [Log out]

    ! !

    ?n?J Koha

    !     ! !
    ???L???]?w???L?? (UNIX ???|)
     
    stopword ?]?w?d?????????????r??
     
    Z39.50 ???A?? ?]?w?d?????????????????????????A??
    ???L???]?w???L?? (UNIX???|)
     
    stopword ?]?w?d?????????????r??
     
    Z39.50???A?? ?]?w?d?????????????????????????A??
    MARC biblio export?H???????????X
    ???X?????????????H???????????X????
    ???L???]?w???L?? (UNIX ???|)
     
    stopword ?]?w?d?????????????r??
     
    Z39.50 ???A?? ?]?w?d?????????????????????????A??
    ???L???]?w???L?? (UNIX???|)
     
    stopword ?]?w?d?????????????r??
     
    Z39.50???A?? ?]?w?d?????????????????????????A??
    MARC biblio export?H???????????X
    ???X?????????????H???????????X????
    ! ! !
    ! ! ! ! ! ! ! ! ! ! !
    ???]?s?X
    ?]?W"> 
    >
    ?a?}
     
     
    ?q??
    ???u
    ?q?l
     
    ! ! ! Confirm delete: !
    ! > !
    !
    !
    !     ! ! !
    ! !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]?@??
    ?]?W?s?X?a?}???O 
    ! ! (?S?????J?a?}) ! ! ! ! !
    ! !
    ! !
    ?q???G     ! !
    ???u?G     ! !
    ?q?l?G     !     !     		! ! (?S???]?w???O) ! ! !
    !     !     !     		!
    ! ! ! !
    !
    ! ! !
    !
    !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]???O
    ???O?s?X????
    !     ! --- 1,232 ---- ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ???]?s?X ! ! ! ! ! ! !
    ?]?W"> 
    !
    >
    ?a?}
     
     
    ?q??
    ???u
    ?q?l
     
    ! ! ! ?T?w?n???????H !
    ! ! > ! !
    !
    ! !
    ! ! ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]?@?? !
    ?]?W?s?X?a?}???O  
    ! ! (?S?????J?a?}) ! ! ! ! !
    ! !
    ! !
    ?q???G ! !
    ???u?G ! !
    ?q?l?G ! !     		! ! (?S???]?w???O) ! ! !
    ! ! !     		!
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]???O !
    ???O?s?X????  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ???O?s?X ! ! ! ! ! ! !
    ?W??"> 
    ????"> 
    !
    ! ! ! ! ?T?w?n???????H !
    ! ! ! !
    !
    ! !
    ! ! From acli at users.sourceforge.net Tue Feb 10 08:33:59 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:33:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters branches.tmpl,1.6,1.6.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9925/parameters Modified Files: Tag: rel_2_0 branches.tmpl Log Message: Backport from trunk Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** branches.tmpl 10 Feb 2003 07:27:50 -0000 1.6 --- branches.tmpl 10 Feb 2004 07:33:56 -0000 1.6.2.1 *************** *** 1,115 **** ! ! !

    Logged in as: [Log out]

    ! !

    ?n?J Koha

    !     ! !
    ! ! !
    ! ! ! ! ! ! ! ! ! ! !
    ???]?s?X
    ?]?W"> 
    >
    ?a?}
     
     
    ?q??
    ???u
    ?q?l
     
    !     ! ! Confirm delete: !
    ! > !
    !
    !
    !     ! ! !
    ! !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]?@??
    ?]?W?s?X?a?}???O 
    ! ! (?S?????J?a?}) ! ! ! ! !
    ! !
    ! !
    ?q???G     ! !
    ???u?G     ! !
    ?q?l?G     !     !     		! ! (?S???]?w???O) ! ! !
    !     !     !     		!
    ! ! ! !
    !
    ! ! !
    !
    !
    method=post>
    ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]???O
    ???O?s?X????
    !     ! --- 1,232 ---- ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ???]?s?X ! ! ! ! ! ! !
    ?]?W"> 
    !
    >
    ?a?}
     
     
    ?q??
    ???u
    ?q?l
     
    ! ! ! ?T?w?n???????H !
    ! ! > ! !
    !
    ! !
    ! ! ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]?@?? !
    ?]?W?s?X?a?}???O  
    ! ! (?S?????J?a?}) ! ! ! ! !
    ! !
    ! !
    ?q???G ! !
    ???u?G ! !
    ?q?l?G ! !     		! ! (?S???]?w???O) ! ! !
    ! ! !     		!
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ???]???O !
    ???O?s?X????  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! ! ! !


    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ???O?s?X ! ! ! ! ! ! !
    ?W??"> 
    ????"> 
    !
    ! ! ! ! ?T?w?n???????H !
    ! ! ! !
    !
    ! !
    ! ! From acli at users.sourceforge.net Tue Feb 10 08:39:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:39:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.20,1.21 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10628/parameters Modified Files: systempreferences.tmpl Log Message: $script_name in template causes runtime error. Should be a TMPL_VAR Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** systempreferences.tmpl 10 Feb 2004 03:26:06 -0000 1.20 --- systempreferences.tmpl 10 Feb 2004 07:38:57 -0000 1.21 *************** *** 95,99 ****
    CONFIRM DELETION
    --- 95,99 ----
    CONFIRM DELETION !
    From acli at users.sourceforge.net Tue Feb 10 08:39:03 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:39:03 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.18.2.2,1.18.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10622/parameters Modified Files: Tag: rel_2_0 systempreferences.tmpl Log Message: $script_name in template causes runtime error. Should be a TMPL_VAR Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -C2 -r1.18.2.2 -r1.18.2.3 *** systempreferences.tmpl 10 Feb 2004 04:16:06 -0000 1.18.2.2 --- systempreferences.tmpl 10 Feb 2004 07:39:01 -0000 1.18.2.3 *************** *** 95,99 ****
    CONFIRM DELETION !
    --- 95,99 ----
    CONFIRM DELETION !
    From acli at users.sourceforge.net Tue Feb 10 08:54:00 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:00 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.3.2.2,1.3.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12907/includes Modified Files: Tag: rel_2_0 parameters-top.inc Log Message: SGML syntax correction Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** parameters-top.inc 10 Feb 2004 05:57:14 -0000 1.3.2.2 --- parameters-top.inc 10 Feb 2004 07:53:58 -0000 1.3.2.3 *************** *** 6,10 **** /includes/common-style.css"> - ! ! --- 26,31 ---- } ! ! From acli at users.sourceforge.net Tue Feb 10 08:54:20 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes parameters-top.inc,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13009/includes Modified Files: parameters-top.inc Log Message: SGML syntax correction Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** parameters-top.inc 10 Feb 2004 05:56:33 -0000 1.6 --- parameters-top.inc 10 Feb 2004 07:54:16 -0000 1.7 *************** *** 6,10 **** /includes/common-style.css"> - ! ! --- 26,31 ---- } ! ! From acli at users.sourceforge.net Tue Feb 10 08:54:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13085/parameters Added Files: currency.tmpl Log Message: New file from en --- NEW FILE ---

    ?????f?????v

    ?s?W?f?????v

    ?f??
    ?f??
    ???v
    ???\?g?J????
    ?f??
    ???v
    ?o???O???w?Q???????A???i?????C
    ?T?w?n???????H
    ???\????????

    ?f?????v?]?w

    >
    ?z?d??
    ?f?? ???v
    ???? ????
    << ?W?@??        ?U?@?? >>

    From acli at users.sourceforge.net Tue Feb 10 08:54:51 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 09 Feb 2004 23:54:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13122/parameters Added Files: Tag: rel_2_0 currency.tmpl Log Message: New file from en --- NEW FILE ---

    ?????f?????v

    ?s?W?f?????v

    ?f??
    ?f??
    ???v
    ???\?g?J????
    ?f??
    ???v
    ?o???O???w?Q???????A???i?????C
    ?T?w?n???????H
    ???\????????

    ?f?????v?]?w

    >
    ?z?d??
    ?f?? ???v
    ???? ????
    << ?W?@??        ?U?@?? >>

    From acli at users.sourceforge.net Tue Feb 10 09:02:31 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:02:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14491/parameters Modified Files: currency.tmpl Log Message: This is more consistent Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** currency.tmpl 10 Feb 2004 07:54:36 -0000 1.1 --- currency.tmpl 10 Feb 2004 08:02:25 -0000 1.2 *************** *** 57,63 **** !

    ?????f?????v

    !

    ?s?W?f?????v

    --- 57,63 ---- !

    ?????f??

    !

    ?s?W?f??

    *************** *** 161,165 **** !

    ?f?????v?]?w

    > --- 161,165 ---- !

    ?f?????v

    > From acli at users.sourceforge.net Tue Feb 10 09:02:49 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:02:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters currency.tmpl,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14543/parameters Modified Files: Tag: rel_2_0 currency.tmpl Log Message: This is more consistent Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** currency.tmpl 10 Feb 2004 07:54:49 -0000 1.1.2.1 --- currency.tmpl 10 Feb 2004 08:02:40 -0000 1.1.2.2 *************** *** 57,63 **** !

    ?????f?????v

    !

    ?s?W?f?????v

    --- 57,63 ---- !

    ?????f??

    !

    ?s?W?f??

    *************** *** 161,165 **** !

    ?f?????v?]?w

    > --- 161,165 ---- !

    ?f?????v

    > From acli at users.sourceforge.net Tue Feb 10 09:22:28 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:22:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters aqbookfund.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17489/parameters Modified Files: aqbookfund.tmpl Log Message: Sync to en, not yet translated Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbookfund.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** aqbookfund.tmpl 5 Feb 2003 05:03:18 -0000 1.2 --- aqbookfund.tmpl 10 Feb 2004 08:22:24 -0000 1.3 *************** *** 1,34 **** ! ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    !     ! ! ! bookfund admin method=post> ! !
    You Searched for


    ! ! ! ! ! " ! ! ! ! ! ! ! !
    Book fundNameGroupBudget     
      ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  
    !

          


     

    !     ! !

    !
    ! ! ! ! ! !
    Book fund>
    Book fund
    Name 
    Group
     
    !     ! ! data recorded !
    !     ! ! ! ! !

     

    ! ! ! data deleted !
    ! "" !     ! --- 101,143 ---- } !

    !
    Book fund
    Name
    Group
    CONFIRM DELETION
    ! ! ! ! !
    Book fund>
    Book fund
    Name 
     
    ! ! ! Data recorded !
    ! ! ! ! ! !

     

    ! ! ! Data deleted ! ! ! ! From acli at users.sourceforge.net Tue Feb 10 09:22:43 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:22:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters aqbookfund.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17553/parameters Modified Files: Tag: rel_2_0 aqbookfund.tmpl Log Message: Sync to en, not yet translated Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbookfund.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** aqbookfund.tmpl 5 Feb 2003 05:03:18 -0000 1.2 --- aqbookfund.tmpl 10 Feb 2004 08:22:41 -0000 1.2.2.1 *************** *** 1,34 **** ! ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    !     ! ! ! bookfund admin
    method=post> ! !
    You Searched for


    ! !

    Book fund
    Name
    CONFIRM DELETION
    ! ! ! " ! ! ! ! ! ! ! !
    Book fundNameGroupBudget     
      ">Budget?op=add_form&bookfundid= ">Edit?op=delete_confirm&bookfundid=">Delete  
    !
          


     

    !     ! !

    !
    ! ! ! ! ! !
    Book fund>
    Book fund
    Name 
    Group
     
    !     ! ! data recorded !
    !     ! ! ! ! !

     

    ! ! ! data deleted !
    ! "" !     ! --- 101,143 ---- } !

    !
    Book fund
    Name
    Group
    CONFIRM DELETION
    ! ! ! ! !
    Book fund>
    Book fund
    Name 
     
    ! ! ! Data recorded !
    ! ! ! ! ! !

     

    ! ! ! Data deleted ! ! ! ! From acli at users.sourceforge.net Tue Feb 10 09:36:15 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 00:36:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters itemtypes.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20054/parameters Modified Files: itemtypes.tmpl Log Message: Sync to en template Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/itemtypes.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** itemtypes.tmpl 5 Feb 2003 04:44:18 -0000 1.2 --- itemtypes.tmpl 10 Feb 2004 08:36:13 -0000 1.3 *************** *** 1,3 **** ! ! ! !

    ?????]?????O

    ! !

    ?[?@?]?????O

    !     !
    Book fund
    Name
    CONFIRM DELETION
    ! ! ! ! ! ! ! ! ! ! ! ! !
    ?]?????O>
    ?]?????O
    ???? 
    ?i???h?[?H?]?H???p?^
    ?i?_?????Hchecked value=1>
    ?O??
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ?]?????O
    ????
    ?i???h?[ ?????i???X
    ?i?_?????i?H???????i????
    ?O??
    ?o???]?????O???t?????w?X?{?F ???A???i?R???C
    ?u???n?R?????H
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ?s?X ! ?????i???h?[?i?_?????O??  
    ?????i???X?i?H???????i?????op=add_form&itemtype=">?????op=delete_confirm&itemtype=">?R??
    !
    !
    !     ! --- 60,162 ---- } ! ! !

    ?????]?????O

    ! !

    ?s?W?]?????O

    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    ?]?????O>
    ?]?????O
    ???? 
    ?i???h?[ (?H???p)
    ?i?_????checked value=1>
    ???\?O??
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ?]?????O
    ????
    ?i???h?[?????i???X
    ?i?_?????i?H???????i????
    ???\?O??
    ?o???O???Q?????A?????????C
    ?T?w?n???????H
    ! ! !

    ?]?w?]?????O

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ?s?X ! ?????i???h?[?i?_???????\?O??????????
    ?i?H???????i?????op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !
    !
    ! ! ! ! ! ! !
    ! ! //images/1leftarrow.png" title="?W?@??" ALT="?W?@??" BORDER=0>//images/1rightarrow.png" title="?U?@??" ALT="?U?@??" BORDER=0>
    ! ! From tipaul at users.sourceforge.net Tue Feb 10 10:02:56 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 01:02:56 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac-css.fr,1.1.2.4,1.1.2.5 translator_doc.txt,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24737/misc/translator Modified Files: Tag: rel_2_0 opac-css.fr translator_doc.txt Log Message: * updated french css opac * fixes in translator doc Index: opac-css.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/Attic/opac-css.fr,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -r1.1.2.4 -r1.1.2.5 *** opac-css.fr 26 Jan 2004 10:42:27 -0000 1.1.2.4 --- opac-css.fr 10 Feb 2004 09:02:53 -0000 1.1.2.5 *************** *** 12,18 **** Author Auteur Available Disponible ! barcode LIMITED:code barre ! Barcode LIMITED:Code barre ! BARCODE LIMITED:CODE BARRE Biblio number Notice biblio : Biblionumber Num?ro notice : --- 12,18 ---- Author Auteur Available Disponible ! barcode LIMITED;code barre ! Barcode LIMITED;Code barre ! BARCODE LIMITED;CODE BARRE Biblio number Notice biblio : Biblionumber Num?ro notice : *************** *** 79,83 **** Library Card Carte lecteur Loan Length Dur?e pr?t ! Location LIMITED:Localisation location LIMITED;Localisation Log In S'identifier --- 79,83 ---- Library Card Carte lecteur Loan Length Dur?e pr?t ! Location LIMITED;Localisation location LIMITED;Localisation Log In S'identifier *************** *** 135,139 **** Results through of records. r?sultats de ? results found R?ponses trouv?es ! search LIMITED:chercher Search the catalogue Chercher dans le catalogue Sep Sep --- 135,139 ---- Results through of records. r?sultats de ? results found R?ponses trouv?es ! search LIMITED;recherche Search the catalogue Chercher dans le catalogue Sep Sep Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** translator_doc.txt 16 Jan 2004 16:24:19 -0000 1.1.2.1 --- translator_doc.txt 10 Feb 2004 09:02:53 -0000 1.1.2.2 *************** *** 15,25 **** ============ 1- create your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & french being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version, go back to pt1 & repeat. WEAKNESSES --- 15,31 ---- ============ 1- create your translation file : ! ./tmpl_process.pl create -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images/css files in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version : ! 1- update your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate new your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) ! 3- create your translated version : ! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy new images/css files in your new directory if needed WEAKNESSES From tipaul at users.sourceforge.net Tue Feb 10 10:09:45 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 01:09:45 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.32.2.5,1.32.2.6 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26014/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.pl Log Message: small fix to handle tags<10 Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.32.2.5 retrieving revision 1.32.2.6 diff -C2 -r1.32.2.5 -r1.32.2.6 *** addbiblio.pl 6 Feb 2004 14:14:55 -0000 1.32.2.5 --- addbiblio.pl 10 Feb 2004 09:09:41 -0000 1.32.2.6 *************** *** 232,235 **** --- 232,236 ---- next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); + next if ($tag<10); next if (defined($record->field($tag)->subfield($subfield))); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 241,245 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); From acli at users.sourceforge.net Tue Feb 10 10:36:46 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:36:46 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31712 Modified Files: tmpl_process.pl Log Message: Arrays are always defined. We should check its length instead. Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** tmpl_process.pl 9 Feb 2004 23:34:08 -0000 1.6 --- tmpl_process.pl 10 Feb 2004 09:36:44 -0000 1.7 *************** *** 31,35 **** # Checks for missing input and string list arguments ! if( !defined(@in_files) || !defined($str_file) ) { usage("You must at least specify input and string list filenames."); --- 31,35 ---- # Checks for missing input and string list arguments ! if( !@in_files || !defined($str_file) ) { usage("You must at least specify input and string list filenames."); From acli at users.sourceforge.net Tue Feb 10 10:40:23 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:40:23 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32380 Modified Files: tmpl_process.pl Log Message: Minor correction in help text This handling for --help works too, and is less wordy Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** tmpl_process.pl 10 Feb 2004 09:36:44 -0000 1.7 --- tmpl_process.pl 10 Feb 2004 09:40:21 -0000 1.8 *************** *** 19,27 **** 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => \$help, ) || (usage(), exit(-1)); - help() if $help; - # utiliser glob() pour tous les fichiers d'un repertoire --- 19,25 ---- 'exclude=s' => \@excludes, 'sep=s' => \$split_char, ! 'help' => sub { help() }, ) || (usage(), exit(-1)); # utiliser glob() pour tous les fichiers d'un repertoire *************** *** 428,432 **** input files. ! -r or --recursive= Use the recursive mode to process every entry in subdirectories. Note: Symbolic links used to link directories are not supported. --- 426,430 ---- input files. ! -r or --recursive Use the recursive mode to process every entry in subdirectories. Note: Symbolic links used to link directories are not supported. From acli at users.sourceforge.net Tue Feb 10 10:42:20 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 10 Feb 2004 01:42:20 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process.pl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv581 Modified Files: tmpl_process.pl Log Message: exit(-1) after usage() is not needed Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** tmpl_process.pl 10 Feb 2004 09:40:21 -0000 1.8 --- tmpl_process.pl 10 Feb 2004 09:42:18 -0000 1.9 *************** *** 20,24 **** 'sep=s' => \$split_char, 'help' => sub { help() }, ! ) || (usage(), exit(-1)); # utiliser glob() pour tous les fichiers d'un repertoire --- 20,24 ---- 'sep=s' => \$split_char, 'help' => sub { help() }, ! ) || usage(); # utiliser glob() pour tous les fichiers d'un repertoire From tipaul at users.sourceforge.net Tue Feb 10 14:15:48 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:15:48 -0800 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.78.2.2,1.78.2.3 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10256/C4 Modified Files: Tag: rel_2_0 Biblio.pm Log Message: removing 2 warnings Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.78.2.2 retrieving revision 1.78.2.3 diff -C2 -r1.78.2.2 -r1.78.2.3 *** Biblio.pm 26 Jan 2004 10:38:06 -0000 1.78.2.2 --- Biblio.pm 10 Feb 2004 13:15:46 -0000 1.78.2.3 *************** *** 1558,1562 **** } $query =~ s/\,$//; - warn "Q 1560 : $query"; my $sth2=$dbh->prepare($query); $sth2->execute(@bind); --- 1558,1561 ---- *************** *** 1583,1587 **** #replacing the last , by ",?)" $query=~ s/\,$//; - warn "Q olddelbiblio : $query"; $sth=$dbh->prepare($query); $sth->execute(@bind); --- 1582,1585 ---- *************** *** 2194,2197 **** --- 2192,2198 ---- # $Id$ # $Log$ + # Revision 1.78.2.3 2004/02/10 13:15:46 tipaul + # removing 2 warnings + # # Revision 1.78.2.2 2004/01/26 10:38:06 tipaul # dealing correctly "bulk" field From tipaul at users.sourceforge.net Tue Feb 10 14:17:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.24.2.1,1.24.2.2 addbooks.tmpl,1.12,1.12.2.1 isbnsearch.tmpl,1.11,1.11.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10580/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: Tag: rel_2_0 addbiblio.tmpl addbooks.tmpl isbnsearch.tmpl Log Message: bug fixes in HTML, and (addbiblio.tmpl), bugfix for bibliodeletion Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -C2 -r1.24.2.1 -r1.24.2.2 *** addbiblio.tmpl 26 Jan 2004 10:46:36 -0000 1.24.2.1 --- addbiblio.tmpl 10 Feb 2004 13:17:08 -0000 1.24.2.2 *************** *** 17,35 **** ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! z3950 search
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! ! ! ! ! z3950 search
    +   + + +
    >>>>
    +     +
    *************** *** 85,88 **** --- 100,115 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 110,113 **** --- 137,152 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 135,138 **** --- 174,189 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 160,163 **** --- 211,226 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 185,188 **** --- 248,263 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 210,213 **** --- 285,300 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 235,238 **** --- 322,337 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 260,263 **** --- 359,374 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 285,288 **** --- 396,404 ---- + + +
    <<<<
    +     + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -r1.12 -r1.12.2.1 *** addbooks.tmpl 9 Dec 2003 10:29:06 -0000 1.12 --- addbooks.tmpl 10 Feb 2004 13:17:08 -0000 1.12.2.1 *************** *** 22,26 **** ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    --- 22,26 ---- ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    *************** *** 32,38 ****   ! Create Empty biblio ! Create Empty biblio --- 32,38 ----   ! Create Empty biblio ! Create Empty biblio *************** *** 52,56 **** Keyword: ! --- 52,56 ---- Keyword: ! Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** isbnsearch.tmpl 9 Dec 2003 10:29:07 -0000 1.11 --- isbnsearch.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 *************** *** 5,9 **** results found
    ! Results to displayed

    --- 5,9 ---- results found
    ! Results to displayed

    *************** *** 46,50 **** ! ">Add Items ">Edit... --- 46,50 ---- ! ">Add items ">Edit... From tipaul at users.sourceforge.net Tue Feb 10 14:17:11 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.7.2.1,1.7.2.2 basket.tmpl,1.7.2.2,1.7.2.3 newbasket2.tmpl,1.7,1.7.2.1 order.tmpl,1.11,1.11.2.1 recieve.tmpl,1.6,1.6.2.1 supplier.tmpl,1.8,1.8.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10580/koha-tmpl/intranet-tmpl/default/en/acqui Modified Files: Tag: rel_2_0 acquire.tmpl basket.tmpl newbasket2.tmpl order.tmpl recieve.tmpl supplier.tmpl Log Message: bug fixes in HTML, and (addbiblio.tmpl), bugfix for bibliodeletion Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** acquire.tmpl 13 Jan 2004 17:29:30 -0000 1.7.2.1 --- acquire.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.2 *************** *** 6,10 **** !

    Receipt Summary for: Invoice,

    --- 6,10 ---- !

    Receipt Summary for: Invoice

    Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -r1.7.2.2 -r1.7.2.3 *** basket.tmpl 26 Jan 2004 10:46:36 -0000 1.7.2.2 --- basket.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.3 *************** *** 2,6 ****

    Shopping Basket for >


    ! (Our Reference: , #, authorised by: )

    --- 2,6 ----

    Shopping Basket for >


    ! Our Reference: , # authorised by

    Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** newbasket2.tmpl 9 Dec 2003 10:29:08 -0000 1.7 --- newbasket2.tmpl 10 Feb 2004 13:17:08 -0000 1.7.2.1 *************** *** 30,34 **** results found. !
    Results to displayed. --- 30,34 ---- results found. !
    Results to displayed.
    Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** order.tmpl 9 Dec 2003 10:29:08 -0000 1.11 --- order.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 *************** *** 23,27 **** > > - - -
    ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > --- 23,31 ----
    ! ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > ! ! Inactive ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** recieve.tmpl 9 Dec 2003 10:29:08 -0000 1.6 --- recieve.tmpl 10 Feb 2004 13:17:08 -0000 1.6.2.1 *************** *** 6,10 **** !

    Receipt Summary for : , Invoice

    --- 6,10 ---- !

    Receipt Summary for : Invoice

    Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** supplier.tmpl 9 Dec 2003 10:29:08 -0000 1.8 --- supplier.tmpl 10 Feb 2004 13:17:08 -0000 1.8.2.1 *************** *** 85,91 ****
    /images/filesave.png" border=0 title="save" alt="save">
    --- 85,88 ---- *************** *** 96,101 **** Supplier is ! checked>Active ! checked>Inactive --- 93,104 ---- Supplier is ! ! ! Active ! Inactive ! ! Active ! Inactive ! *************** *** 153,157 **** !

    --- 156,161 ---- !
    !
    /images/filesave.png" border=0 title="save" alt="save" class="button">
    From tipaul at users.sourceforge.net Tue Feb 10 14:17:59 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:17:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue catalogue-home.tmpl,1.8.2.1,1.8.2.2 cmsdsearchresults.tmpl,1.2,1.2.2.1 detail-opac.tmpl,1.5,1.5.2.1 detail.tmpl,1.9.2.2,1.9.2.3 MARCdetail.tmpl,1.14,1.14.2.1 moredetail.tmpl,1.9,1.9.2.1 subject.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10744/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl subject.tmpl Log Message: HTML modifs to improve translation tool Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -r1.8.2.1 -r1.8.2.2 *** catalogue-home.tmpl 26 Jan 2004 10:46:35 -0000 1.8.2.1 --- catalogue-home.tmpl 10 Feb 2004 13:17:57 -0000 1.8.2.2 *************** *** 24,28 **** ! HELP
    --- 24,28 ---- ! HELP
    *************** *** 97,101 **** ! Virtual Bookshelves --- 97,101 ---- ! Virtual Bookshelves Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** cmsdsearchresults.tmpl 9 Dec 2003 10:29:05 -0000 1.2 --- cmsdsearchresults.tmpl 10 Feb 2004 13:17:57 -0000 1.2.2.1 *************** *** 24,28 ****
    ! Results through of records.
    --- 24,28 ----
    ! Results through of records.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** detail-opac.tmpl 9 Dec 2003 10:29:06 -0000 1.5 --- detail-opac.tmpl 10 Feb 2004 13:17:57 -0000 1.5.2.1 *************** *** 38,46 **** ! ! --- 38,46 ----
    Item Type Class Location Date DueLast Seen
    ! ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -r1.9.2.2 -r1.9.2.3 *** detail.tmpl 26 Jan 2004 10:46:35 -0000 1.9.2.2 --- detail.tmpl 10 Feb 2004 13:17:57 -0000 1.9.2.3 *************** *** 60,67 ****
    Item type Class Location Date DueLast seen
    ! ! --- 60,67 ----
    Item Type Location Date DueLast Seen Barcode Volume
    ! ! Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -r1.14 -r1.14.2.1 *** MARCdetail.tmpl 9 Dec 2003 10:29:06 -0000 1.14 --- MARCdetail.tmpl 10 Feb 2004 13:17:57 -0000 1.14.2.1 *************** *** 19,22 **** --- 19,23 ---- + *************** *** 257,263 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** moredetail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- moredetail.tmpl 10 Feb 2004 13:17:57 -0000 1.9.2.1 *************** *** 31,38 **** Biblionumber:
    ! Item Type:
    URL:
    ! Loan Length:
    ! Rental Charge:
    Classification:
    ISBN:
    --- 31,38 ---- Biblionumber:
    ! Item type:
    URL:
    ! Loan length:
    ! Rental charge:
    Classification:
    ISBN:
    Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** subject.tmpl 9 Dec 2003 10:29:06 -0000 1.4 --- subject.tmpl 10 Feb 2004 13:17:57 -0000 1.4.2.1 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 ****
    Item type Location Date DueLast seen Barcode Volume//images/edittrash.png"> ">Normal')">Print MARC biblio :
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Subject
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !
    !

    ! Results through of records.
    --- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subject
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Results through of records.
    From tipaul at users.sourceforge.net Tue Feb 10 14:19:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:19:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15.2.2,1.15.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10939/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: Tag: rel_2_0 circulation.tmpl Log Message: HTML modifs to improve translation tool Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15.2.2 retrieving revision 1.15.2.3 diff -C2 -r1.15.2.2 -r1.15.2.3 *** circulation.tmpl 29 Jan 2004 19:07:30 -0000 1.15.2.2 --- circulation.tmpl 10 Feb 2004 13:19:01 -0000 1.15.2.3 *************** *** 5,9 **** ! &branch=&printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &printer=&print=yes"> Next Borrower  *************** *** 14,24 **** !

    Circulation: Issues


    ! Branch:
    ! Printer:
    !     Change Settings "> "> -

     

    --- 14,21 ----
    !

    Circulation: Issues

    ! Branch: Printer: Change Settings "> "> *************** *** 38,42 **** Branch:
    Printer:
    ! Change Settings"> "> --- 35,39 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 141,145 ****
    ! --- 138,142 ----
    ! *************** *** 172,176 ****
    ! ! --- 13,17 ---- ! *************** *** 41,45 **** Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray et Turo Technology LLP, england (quality control, installer & updater)
    Nicolas Morin, Fran?ais Translation
    --- 41,45 ---- Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! 1
    Nicolas Morin, Fran?ais Translation
    *************** *** 65,69 **** Ambrose Li
    Andrew Arensburger
    ! Benedykt P. Barszcz (polish for 2.0)
    Brig C. McCoy
    Daniel Holth
    --- 65,69 ---- Ambrose Li
    Andrew Arensburger
    ! 1
    Brig C. McCoy
    Daniel Holth
    *************** *** 84,88 ****
    --- 169,173 ---- ! ! --- 184,188 ---- ! *************** *** 225,229 ****
    *************** *** 187,191 **** Item Barcode:
    Item Barcode:
    ! ! --- 93,104 ---- ! ! ! Actif ! Inactif ! *************** *** 153,157 ****
    Borrower information
    --- 222,226 ---- ! --- 260,264 ---- ! *************** *** 273,279 ****
    Borrower information
    *************** *** 263,267 **** !
    ODUESYes, See below
    ODUESYes, See below
    !



    !
    /images/background-mem.gif"> --- 270,276 ----
    !
    ! --- 90,100 ---- ! Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -C2 -r1.8 -r1.8.2.1 *** common-style.css 4 Sep 2003 13:04:12 -0000 1.8 --- common-style.css 10 Feb 2004 13:19:21 -0000 1.8.2.1 *************** *** 2,8 **** text-align: center; font: 1.2em sans-serif; ! padding: 10px 15px; border-style: solid; ! border-width: 2px; border-color: black; text-decoration: none; --- 2,8 ---- text-align: center; font: 1.2em sans-serif; ! padding: 3px; border-style: solid; ! border-width: 1px; border-color: black; text-decoration: none; *************** *** 13,17 **** background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } - #problem { color: red; --- 13,16 ---- *************** *** 28,31 **** --- 27,36 ---- border-left:1px solid #000000; } + a { + text-decoration: none; + } + a:hover { + text-decoration: none; + } a.submenu { font-weight: normal; Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -r1.6 -r1.6.2.1 *** issues-top.inc 9 Dec 2003 10:29:04 -0000 1.6 --- issues-top.inc 10 Feb 2004 13:19:21 -0000 1.6.2.1 *************** *** 172,176 **** ! ! --- 118,122 ---- ! From tipaul at users.sourceforge.net Tue Feb 10 14:54:18 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:54:18 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports reports-home.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19195/koha-tmpl/intranet-tmpl/default/en/reports Modified Files: Tag: rel_2_0 reports-home.tmpl Log Message: html fix for translation Index: reports-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** reports-home.tmpl 9 Dec 2003 10:28:59 -0000 1.4 --- reports-home.tmpl 10 Feb 2004 13:54:00 -0000 1.4.2.1 *************** *** 8,13 ****
    • Till Reconciliation: Daily Report (yesterday) !
    • Till Reconciliation: Daily ! Report (today)
    • Overdue items --- 8,12 ----
      • Till Reconciliation: Daily Report (yesterday) !
      • Till Reconciliation: Daily Report (today)
      • Overdue items From tipaul at users.sourceforge.net Tue Feb 10 15:05:41 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:05:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.3.2.3,1.3.2.4 acquire.tmpl,1.1.2.3,1.1.2.4 basket.tmpl,1.5.2.2,1.5.2.3 newbasket2.tmpl,1.4.2.3,1.4.2.4 newbasket.tmpl,1.1.2.2,1.1.2.3 newbiblio.tmpl,1.5.2.3,1.5.2.4 order.tmpl,1.3.2.1,1.3.2.2 recieve.tmpl,1.1.2.1,1.1.2.2 supplier.tmpl,1.4.2.3,1.4.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: Tag: rel_2_0 acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieve.tmpl supplier.tmpl Log Message: french translation fixes Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** acqui-home.tmpl 28 Jan 2004 16:44:20 -0000 1.3.2.3 --- acqui-home.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.4 *************** *** 54,58 ****
    ! --- 54,58 ---- ! *************** *** 72,76 **** ! --- 72,76 ---- ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** acquire.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- acquire.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 6,10 **** !

    Receipt Summary for: Facture,

    --- 6,10 ---- !

    Sommaire pour: Facture

    *************** *** 72,76 ****
    ! --- 72,76 ---- ! *************** *** 135,139 **** !

     

    --- 135,139 ---- !

     

    Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -r1.5.2.2 -r1.5.2.3 *** basket.tmpl 26 Jan 2004 10:47:58 -0000 1.5.2.2 --- basket.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.3 *************** *** 2,6 ****

    Panier pour >


    ! (Ref: , #, saisi par: )

    --- 2,6 ----

    Panier pour >


    ! Notre ref: , # valid?e par

    Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** newbasket2.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.3 --- newbasket2.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4 *************** *** 17,21 **** > Nouvelle recherche: !

    --- 17,21 ---- > Nouvelle recherche: !
    *************** *** 30,34 **** R?sultats trouv?s. !
    R?sultats to displayed.
    /images/background-mem.gif"> From tipaul at users.sourceforge.net Tue Feb 10 14:19:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 05:19:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes cat-top.inc,1.18,1.18.2.1 common-style.css,1.8,1.8.2.1 issues-top.inc,1.6,1.6.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11030/koha-tmpl/intranet-tmpl/default/en/includes Modified Files: Tag: rel_2_0 cat-top.inc common-style.css issues-top.inc Log Message: HTML modifs to improve translation tool Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -r1.18 -r1.18.2.1 *** cat-top.inc 9 Dec 2003 10:29:04 -0000 1.18 --- cat-top.inc 10 Feb 2004 13:19:21 -0000 1.18.2.1 *************** *** 90,97 **** ! Add biblio ! Cat maintenance
    ! Virtual shelves ! Add biblio ! ! Cat maintenance
    TOTALYou have error(s) in your MARC configuration. Please fix them before using koha
    TOTALYou have error(s) in your MARC configuration. Please fix them before using koha
    Total D?pens?Comtd Disp.
    Total D?pens?Engag? Disp.
    Volume Info (for serials) *
    Info Volume (pour p?riodiques) *
    --- 30,34 ---- R?sultats trouv?s. !
    R?sultats to affich?.
    *************** *** 93,97 **** &offset=&type=&id=&basket=&search=&author="> ! Suivant --- 93,97 ---- &offset=&type=&id=&basket=&search=&author="> ! Next Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** newbasket.tmpl 26 Jan 2004 10:47:58 -0000 1.1.2.2 --- newbasket.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.3 *************** *** 2,6 ****

    Panier for


    ! (Ref: , #, saisi par: )
    T?l.: , Fax:
    ,
    --- 2,6 ----

    Panier for


    ! (Notre ref: , #, valid?e par: )
    T?l.: , Fax:
    ,
    Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** newbiblio.tmpl 28 Jan 2004 16:44:20 -0000 1.5.2.3 --- newbiblio.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.4 *************** *** 130,134 **** ! --- 130,134 ---- ! Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** order.tmpl 20 Jan 2004 09:09:16 -0000 1.3.2.1 --- order.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.2 *************** *** 23,30 **** > --- 23,34 ---- > Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** recieve.tmpl 20 Jan 2004 09:09:16 -0000 1.1.2.1 --- recieve.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 6,10 **** !

    Receipt Summary for : , Facture

    --- 6,10 ---- !

    Sommaire pour : Facture

    Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** supplier.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.3 --- supplier.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.4 *************** *** 85,91 ****
    - - -
    Co?ts budget?s
    (ex GST, inc discount)     		" onchange='mettre ? jour(this.form)'>
    Co?ts budget?s
    (ex TVA, remise)     		" onchange='mettre ? jour(this.form)'>
    ! /images/mail_send.png" title="Ajouter order" ALT="Ajouter" BORDER=0 > ! /images/mail_get.png" title="receive" ALT="Ajouter" BORDER=0 >
    ! ! /images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 > ! ! Inactif ! ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 >
    /images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer">
    --- 85,88 ---- *************** *** 96,101 ****
    Le fournisseur estchecked>Active ! checked>Inactive
    Le fournisseur est ! ! Actif ! Inactif
    ! --- 156,161 ----
    !
    !
    /images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" class="button"> From tipaul at users.sourceforge.net Tue Feb 10 15:05:42 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:05:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.1.2.2,1.1.2.3 auth.tmpl,1.1.2.1,1.1.2.2 boraccount.tmpl,1.4.2.2,1.4.2.3 charges.tmpl,1.1.2.1,1.1.2.2 default.tmpl,1.1.2.3,1.1.2.4 intranet-main.tmpl,1.6.2.1,1.6.2.2 mancredit.tmpl,1.1.2.1,1.1.2.2 maninvoice.tmpl,1.1.2.3,1.1.2.4 member-flags.tmpl,1.1.2.1,1.1.2.2 modbibitem.tmpl,1.1.2.3,1.1.2.4 modbib.tmpl,1.2.2.3,1.2.2.4 newjmember.tmpl,1.1.2.3,1.1.2.4 newmember.tmpl,1.3.2.3,1.3.2.4 opac-main.tmpl,1.1.2.2,1.1.2.3 overdue.tmpl,1.1.2.1,1.1.2.2 request.tmpl,1.5.2.3,1.5.2.4 shelves.tmpl,1.1.2.2,1.1.2.3 thesaurus_popup.tmpl,1.3.2.2,1.3.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/default/fr Modified Files: Tag: rel_2_0 about.tmpl auth.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl member-flags.tmpl modbibitem.tmpl modbib.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl request.tmpl shelves.tmpl thesaurus_popup.tmpl Log Message: french translation fixes Index: about.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/about.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** about.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- about.tmpl 10 Feb 2004 14:05:38 -0000 1.1.2.3 *************** *** 13,17 ****
    OS version (from 'uname -a'):
    Version Syst?me (uname -a):
    ! Michel Lerenard (Esiee Ecole)
    Mike Johnson
    Mike Mylonas
    --- 84,88 ----     		! 1
    Mike Johnson
    Mike Mylonas
    Index: auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/auth.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** auth.tmpl 20 Jan 2004 09:14:25 -0000 1.1.2.1 --- auth.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 1,20 **** !

    D?sol?, vous n'avez pas la permission d'acc?der ? cette page.

    !

    Sorry, your session has timed out. Please connecter again.

    !

    Vous avez chang? d'adresse IP. Identifiez-vous ? nouveau.

    !

    Vous entered an incorrect username ou password. Please try again.

    --- 1,20 ---- !

    D?sol?, vous n'avez pas la permission d'acc?der ? cette page.

    !

    Sorry, your session has timed out. Please connecter again.

    !

    Vous avez chang? d'adresse IP. Identifiez-vous ? nouveau.

    !

    Vous entered an incorrect username ou password. Please try again.

    Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -C2 -r1.4.2.2 -r1.4.2.3 *** boraccount.tmpl 28 Jan 2004 16:44:20 -0000 1.4.2.2 --- boraccount.tmpl 10 Feb 2004 14:05:39 -0000 1.4.2.3 *************** *** 3,7 **** !

    Account for ">

    Cr?er une facture manuelle   --- 3,7 ---- !

    Compte pour ">

    Cr?er une facture manuelle   *************** *** 39,43 ****

    !

     

    --- 39,43 ----
    !

     

    Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** charges.tmpl 20 Jan 2004 09:14:53 -0000 1.1.2.1 --- charges.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 4,9 ****

    ! Chaque champ/bo?te doit ?tre remplie avec le montant de l'amende, quand d?bute son calcul, son cycle
    ! eg 1,7,7 = $1 fine, after 7 days, every 7 days.

    --- 4,9 ----

    ! Chaque champ/bo?te doit ?tre remplie avec le montant de l'amende, quand d?bute son calcul, sa p?riodicit?
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, apr?s 7 jours, chaque 7 jours.

    Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/default.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** default.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- default.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 16,22 ****
    ! &startfrom=>Pr?c?dents Records ! &startfrom=>Suivant Records
    --- 16,22 ----
    ! &startfrom=>Previous Records ! &startfrom=>Next Records
    *************** *** 24,28 ****
    ! R?sultats ? sur enregistrements.

    --- 24,28 ----
    ! R?sultats ? sur enregistrements.
    Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -r1.6.2.1 -r1.6.2.2 *** intranet-main.tmpl 20 Jan 2004 09:14:53 -0000 1.6.2.1 --- intranet-main.tmpl 10 Feb 2004 14:05:39 -0000 1.6.2.2 *************** *** 81,85 **** !
    Saisissez une valeur et pressez la touche Entr?e..
    --- 81,85 ---- !
    Saisissez une valeur et pressez la touche Entr?e..
    *************** *** 87,91 **** /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Advanced Search (More Options)
    --- 87,91 ---- /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Recherche avanc?e (plus d'options)
    *************** *** 110,114 **** !
    Saisissez une valeur et pressez la touche Entr?e..
    /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0"> --- 110,114 ---- !
    Saisissez une valeur et pressez la touche Entr?e..
    /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0"> Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** mancredit.tmpl 20 Jan 2004 09:14:53 -0000 1.1.2.1 --- mancredit.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 16,20 **** Description Montant ! --- 16,20 ---- Description Montant ! Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** maninvoice.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- maninvoice.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 19,23 **** Description Montant ! --- 19,23 ---- Description Montant ! Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/Attic/member-flags.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** member-flags.tmpl 20 Jan 2004 09:14:25 -0000 1.1.2.1 --- member-flags.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.2 *************** *** 23,27 ****

    ! --- 23,27 ----

    ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** modbibitem.tmpl 28 Jan 2004 16:44:20 -0000 1.1.2.3 --- modbibitem.tmpl 10 Feb 2004 14:05:39 -0000 1.1.2.4 *************** *** 24,28 **** ! Cat?g ouvrage" size=20> --- 24,28 ---- ! Cat?g ouvrage" size=20> *************** *** 68,72 **** ! CHANGES TO AFFECT THESE BARCODES
    S?lectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-s?lectionn?s ne seront pas affect?s. --- 68,72 ---- ! MODIFS SUR CES CODES-BARRES
    S?lectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-s?lectionn?s ne seront pas affect?s. *************** *** 101,105 **** AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some items, tick the appropriate ones et a new group record will be created automatically for them. !

     

    --- 101,105 ---- AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some items, tick the appropriate ones et a new group record will be created automatically for them. !

     

    Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** modbib.tmpl 28 Jan 2004 16:44:20 -0000 1.2.2.3 --- modbib.tmpl 10 Feb 2004 14:05:39 -0000 1.2.2.4 *************** *** 53,57 ****
    ! --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** searchresults.tmpl 28 Jan 2004 16:44:56 -0000 1.2.2.3 --- searchresults.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 66,70 **** ! &=&type=opacintra>Pr?c?dents Records   --- 66,70 ---- ! &=&type=opacintra>Previous Records   *************** *** 73,77 **** ! &=&type=opacintra>Suivant Records   --- 73,77 ---- ! &=&type=opacintra>Next Records   Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** subject.tmpl 28 Jan 2004 16:44:56 -0000 1.2.2.3 --- subject.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 **** ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Sujet
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Pr?c?dents Records ! ! &startfrom=>Suivant Records !
    !

    ! R?sultats ? sur enregistrements.
    --- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sujet
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! R?sultats ? sur enregistrements.
    From tipaul at users.sourceforge.net Tue Feb 10 15:06:20 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes about-bottom.inc,1.2.2.1,1.2.2.2 about-top.inc,1.3.2.1,1.3.2.2 acquisitions-bottom.inc,1.4.2.1,1.4.2.2 cat-bottom.inc,1.4.2.1,1.4.2.2 cat-top.inc,1.12.2.1,1.12.2.2 circulation-bottom.inc,1.4.2.1,1.4.2.2 common-style.css,1.4,1.4.2.1 issues-bottom.inc,1.4.2.1,1.4.2.2 issues-top.inc,1.3.2.2,1.3.2.3 members-bottom.inc,1.4.2.1,1.4.2.2 members-top.inc,1.10.2.1,1.10.2.2 parameters-bottom.inc,1.4.2.1,1.4.2.2 reports-bottom.inc,1.4.2.1,1.4.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21912/koha-tmpl/intranet-tmpl/default/fr/includes Modified Files: Tag: rel_2_0 about-bottom.inc about-top.inc acquisitions-bottom.inc cat-bottom.inc cat-top.inc circulation-bottom.inc common-style.css issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc parameters-bottom.inc reports-bottom.inc Log Message: french translation fixes Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** about-bottom.inc 20 Jan 2004 09:10:33 -0000 1.2.2.1 --- about-bottom.inc 10 Feb 2004 14:06:17 -0000 1.2.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** about-top.inc 20 Jan 2004 09:10:33 -0000 1.3.2.1 --- about-top.inc 10 Feb 2004 14:06:17 -0000 1.3.2.2 *************** *** 7,11 **** ! --- 7,11 ---- ! *************** *** 33,37 **** ! + + +
    --- 33,37 ----
    ! --- 90,100 ---- ! Index: circulation-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/circulation-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** circulation-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- circulation-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: common-style.css =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/common-style.css,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** common-style.css 7 Aug 2003 14:19:55 -0000 1.4 --- common-style.css 10 Feb 2004 14:06:17 -0000 1.4.2.1 *************** *** 2,8 **** text-align: center; font: 1.2em sans-serif; ! padding: 10px 15px; border-style: solid; ! border-width: 2px; border-color: black; text-decoration: none; --- 2,8 ---- text-align: center; font: 1.2em sans-serif; ! padding: 3px; border-style: solid; ! border-width: 1px; border-color: black; text-decoration: none; *************** *** 13,17 **** background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } ! #menubar { border-top:1px solid #666666; --- 13,20 ---- background-image:url("/intranet-tmpl/default/en/images/background-mem.gif"); } ! #problem { ! color: red; ! font-weight:bold; ! } #menubar { border-top:1px solid #666666; *************** *** 24,27 **** --- 27,36 ---- border-left:1px solid #000000; } + a { + text-decoration: none; + } + a:hover { + text-decoration: none; + } a.submenu { font-weight: normal; Index: issues-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** issues-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- issues-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/issues-top.inc,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** issues-top.inc 26 Jan 2004 10:47:57 -0000 1.3.2.2 --- issues-top.inc 10 Feb 2004 14:06:17 -0000 1.3.2.3 *************** *** 89,94 **** --- 73,80 ---- Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** parameters-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- parameters-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** reports-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- reports-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    From tipaul at users.sourceforge.net Tue Feb 10 15:06:20 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio-nomarc.tmpl,1.1.2.3,1.1.2.4 addbiblio.tmpl,1.10.2.3,1.10.2.4 addbooks.tmpl,1.3.2.3,1.3.2.4 additem-nomarc.tmpl,1.1.2.3,1.1.2.4 isbnsearch.tmpl,1.2.2.3,1.2.2.4 marcimport.tmpl,1.2.2.3,1.2.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21912/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: Tag: rel_2_0 addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl isbnsearch.tmpl marcimport.tmpl Log Message: french translation fixes Index: addbiblio-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/addbiblio-nomarc.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** addbiblio-nomarc.tmpl 28 Jan 2004 16:44:56 -0000 1.1.2.3 --- addbiblio-nomarc.tmpl 10 Feb 2004 14:06:18 -0000 1.1.2.4 *************** *** 32,36 **** --- 32,36 ---- Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -C2 -r1.10.2.3 -r1.10.2.4 *** addbiblio.tmpl 28 Jan 2004 16:44:56 -0000 1.10.2.3 --- addbiblio.tmpl 10 Feb 2004 14:06:18 -0000 1.10.2.4 *************** *** 17,35 ****
    Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** acquisitions-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- acquisitions-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** cat-bottom.inc 20 Jan 2004 09:10:33 -0000 1.4.2.1 --- cat-bottom.inc 10 Feb 2004 14:06:17 -0000 1.4.2.2 *************** *** 1,3 **** !

     

    --- 1,3 ---- !

     

    Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -r1.12.2.1 -r1.12.2.2 *** cat-top.inc 20 Jan 2004 09:10:33 -0000 1.12.2.1 --- cat-top.inc 10 Feb 2004 14:06:17 -0000 1.12.2.2 *************** *** 90,97 ****     		! Ajouter une notice biblio ! Maintenance Cat
    ! Rayonnages virtuels ! Ajouter une notice biblio ! ! Maintenance Cat
    ! Ajouter un lecteur ! Ajouter une organisation
    ! Ajouter un lecteur ! Ajouter une organisation
    Titre S?ries:
    ! (if applicable)
    Titre S?ries:
    ! (si applicable)
    ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! Recherche Z39.50
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! ! ! ! ! Recherche Z39.50
    +   + + +
    >>>>
    +     +
    *************** *** 85,88 **** --- 100,115 ---- +
    + +
    <<<<
    +     +     		+ +
    >>>>
    +     +
    *************** *** 110,113 **** --- 137,152 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 135,138 **** --- 174,189 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 160,163 **** --- 211,226 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 185,188 **** --- 248,263 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 210,213 **** --- 285,300 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 235,238 **** --- 322,337 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 260,263 **** --- 359,374 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 285,288 **** --- 396,404 ---- + + +
    <<<<
    +     + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=oui'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=oui'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** addbooks.tmpl 28 Jan 2004 16:44:56 -0000 1.3.2.3 --- addbooks.tmpl 10 Feb 2004 14:06:18 -0000 1.3.2.4 *************** *** 22,26 **** ISBN: ! Si l'ISBN ou le titre est trouv? dans la table biblio, il sera r?cup?r? et peut ?tre modifi?.
    Si l'ISBN ou le titre existe d?j? dans le r?servoir, il va ?tre r?cup?r? et une notice biblio sera ajout?e.
    --- 22,26 ---- ISBN: ! Si l'ISBN ou le titre est trouv? dans la table biblio, il sera r?cup?r? et peut ?tre modifi?.
    Si l'ISBN ou le titre existe d?j? dans le r?servoir, il va ?tre r?cup?r? et une notice biblio sera ajout?e.
    *************** *** 32,38 ****   ! Cr?er une notice biblio vide ! Cr?er une notice biblio vide --- 32,38 ----   ! Cr?er une notice biblio vide ! Cr?er une notice biblio vide *************** *** 52,56 **** Mot-cl?: ! --- 52,56 ---- Mot-cl?: ! Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/additem-nomarc.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** additem-nomarc.tmpl 28 Jan 2004 16:44:56 -0000 1.1.2.3 --- additem-nomarc.tmpl 10 Feb 2004 14:06:18 -0000 1.1.2.4 *************** *** 117,121 **** ! OU Ajouter to a new Groupe: --- 117,121 ---- ! OU Add to a new Groupe: *************** *** 181,185 **** ! Nombre: --- 181,185 ---- ! Nombre;LIMITED: Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** isbnsearch.tmpl 28 Jan 2004 16:44:57 -0000 1.2.2.3 --- isbnsearch.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 5,9 **** R?sultats trouv?s
    ! R?sultats to displayed

    --- 5,9 ---- R?sultats trouv?s
    ! R?sultats to affich?

    *************** *** 46,50 **** ! ">Ajouter Ouvrages ">Editer... --- 46,50 ---- ! ">Ajouter items ">Editer... Index: marcimport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/Attic/marcimport.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** marcimport.tmpl 28 Jan 2004 16:44:57 -0000 1.2.2.3 --- marcimport.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 *************** *** 14,18 ****

    pas import?, car d?j? existant dans la base de donn?es

    pas import?, car d?j? existant dans le r?servoir

    !

    not imported because they seems not to be MARC format (ou ISBN/ISSN missing) !

    enregistrements ?tudi?s

    Retour vers acquisition --- 14,18 ----

    pas import?, car d?j? existant dans la base de donn?es

    pas import?, car d?j? existant dans le r?servoir

    !

    pas import?, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) !

    enregistrements ?tudi?s

    Retour vers acquisition *************** *** 40,44 **** ! Character encoding (MARC21 ou UNIMARC)
    --- 40,44 ---- ! Codage des caract?res (MARC21 ou UNIMARC)
    From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/search.marc search.tmpl,1.4.2.3,1.4.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/search.marc Modified Files: Tag: rel_2_0 search.tmpl Log Message: french translation fixes Index: search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** search.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- search.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 14,25 **** "> ! ! ! ! --- 56,60 ---- ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-main.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-main.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-main.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 42,46 **** Cette biblioth?que fonctionne avec Koha SIGB sous licence libre, respectant les standards de l'internet ! XHTML 1\.0 valide

    --- 42,46 ---- Cette biblioth?que fonctionne avec Koha SIGB sous licence libre, respectant les standards de l'internet ! XHTML 1.0 valide

    Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-moredetail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-moredetail.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-moredetail.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 55,59 **** --- 55,59 ---- *************** *** 72,76 **** Vu:
    Dernier pr?t:
    ! on issue bit Dernier emprunteur 1:
    Dernier emprunteur 2:
    --- 72,76 ---- Vu:
    Dernier pr?t:
    ! En pr?t \? Dernier emprunteur 1:
    Dernier emprunteur 2:
    Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-reserve.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-reserve.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-reserve.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 16,20 ****

    Il y a R?servations d?j? faites sur cet ouvrage

    !

    S?lectionnez les types d'ouvrages souhait?s\. Le premier disponible sera gard? pour vous\.

    --- 16,20 ----

    Il y a R?servations d?j? faites sur cet ouvrage

    !

    S?lectionnez les types d'ouvrages souhait?s. Le premier disponible sera gard? pour vous.

    Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-searchresults.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** opac-searchresults.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.3 --- opac-searchresults.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.4 *************** *** 63,67 **** ! --- 63,67 ---- ! *************** *** 145,149 ****

    ! Essayez une autre LIMITED:chercher

    --- 145,149 ----

    ! Essayez une autre chercher

    Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-userupdate.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** opac-userupdate.tmpl 8 Jan 2004 16:02:40 -0000 1.1.2.1 --- opac-userupdate.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.2 *************** *** 4,8 ****

    Modification informations lecteur

    Changer le n?cessaire
    ! Your changes won't appear until the library has validated them.

    --- 4,8 ----

    Modification informations lecteur

    Changer le n?cessaire
    ! Vos changement n'apparaitront que lorsque la biblioth?que les aura valid?

    Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/subject.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** subject.tmpl 8 Jan 2004 16:02:40 -0000 1.1.2.1 --- subject.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.2 *************** *** 15,19 ****
    		AIDE :
    --- 14,25 ---- "> ! ! ! ! --- 28,33 ---- !
    		AIDE :
    *************** *** 28,32 ****
    ! From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/user userpage.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/user Modified Files: Tag: rel_2_0 userpage.tmpl Log Message: french translation fixes Index: userpage.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** userpage.tmpl 28 Jan 2004 16:45:31 -0000 1.1.2.3 --- userpage.tmpl 10 Feb 2004 14:06:51 -0000 1.1.2.4 *************** *** 11,15 ****
    !
    Reserves
    Vous avez les livres suivants en attente: --- 11,15 ---- ! ! --- 20,24 ---- ! From tipaul at users.sourceforge.net Tue Feb 10 15:07:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/members imemberentry.tmpl,1.5.2.3,1.5.2.4 memberentry.tmpl,1.8.2.3,1.8.2.4 member-password.tmpl,1.2.2.1,1.2.2.2 member.tmpl,1.7.2.3,1.7.2.4 moremember.tmpl,1.13.2.3,1.13.2.4 pay.tmpl,1.5.2.3,1.5.2.4 readingrec.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/members Modified Files: Tag: rel_2_0 imemberentry.tmpl memberentry.tmpl member-password.tmpl member.tmpl moremember.tmpl pay.tmpl readingrec.tmpl Log Message: french translation fixes Index: imemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/imemberentry.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** imemberentry.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- imemberentry.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 116,120 **** --- 116,120 ---- *************** *** 124,128 **** !

     

    --- 124,128 ---- !

     

    Index: memberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -r1.8.2.3 -r1.8.2.4 *** memberentry.tmpl 28 Jan 2004 16:45:32 -0000 1.8.2.3 --- memberentry.tmpl 10 Feb 2004 14:06:52 -0000 1.8.2.4 *************** *** 1,11 **** -

    Ajouter un lecteur Mise ? jour du lecteur !


    --- 1,14 ---- +

    Ajouter un lecteur +

    +

    Mise ? jour du lecteur +

    !
    Index: member-password.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** member-password.tmpl 20 Jan 2004 09:11:08 -0000 1.2.2.1 --- member-password.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.2 *************** *** 11,20 **** > ! Vous have entered a UserID that already exists. Please choose another one.
    Nouvel identifiant utilisateur: >
    Nouveau Mot de passe: >

    ! --- 11,20 ---- > ! Vous avez entered a UserID that already exists. Please choose another one.
    Nouvel identifiant utilisateur: >
    Nouveau Mot de passe: >

    ! Index: member.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -C2 -r1.7.2.3 -r1.7.2.4 *** member.tmpl 28 Jan 2004 16:45:32 -0000 1.7.2.3 --- member.tmpl 10 Feb 2004 14:06:52 -0000 1.7.2.4 *************** *** 7,11 ****
    ! --- 7,11 ----
    ! Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl,v retrieving revision 1.13.2.3 retrieving revision 1.13.2.4 diff -C2 -r1.13.2.3 -r1.13.2.4 *** moremember.tmpl 28 Jan 2004 16:45:32 -0000 1.13.2.3 --- moremember.tmpl 10 Feb 2004 14:06:52 -0000 1.13.2.4 *************** *** 25,29 **** N? Lecteur:
    Cat?gorie Lecteur:
    ! Frais:$30/year, Paid
    Joined: , Expires:
    Annexe d'inscription:

    --- 25,29 ---- N? Lecteur:
    Cat?gorie Lecteur:
    ! Frais:$30/ann?e, Pay?
    Joined: , Expires:
    Annexe d'inscription:

    *************** *** 53,57 ****

    ! Notes g?n?rales:

    --- 53,57 ----

    ! Notes g?n?rales:

    *************** *** 61,65 ****
    ! --- 61,65 ----
    ! Index: pay.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** pay.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- pay.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 39,43 ****

    R?servations
    Vous avez les livres suivants en attente: From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/reports reports-home.tmpl,1.2.2.1,1.2.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/reports Modified Files: Tag: rel_2_0 reports-home.tmpl Log Message: french translation fixes Index: reports-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -r1.2.2.1 -r1.2.2.2 *** reports-home.tmpl 20 Jan 2004 09:14:53 -0000 1.2.2.1 --- reports-home.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.2 *************** *** 7,13 **** !
    • Jusqu'? la r?conciliation: Daily Report (yesterday) !
    • Jusqu'? la r?conciliation: Daily ! Report (today)
    • Ouvrages en retard --- 7,12 ---- !
      • Jusqu'? la r?conciliation: Rapport quotidien (hier) !
      • Jusqu'? la r?conciliation: Rapport quotidien (aujourd'hui)
      • Ouvrages en retard From tipaul at users.sourceforge.net Tue Feb 10 15:06:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:06:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/marcimport AcceptItemCopy.tmpl,1.1.2.2,1.1.2.3 marcimportdetail.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/marcimport Modified Files: Tag: rel_2_0 AcceptItemCopy.tmpl marcimportdetail.tmpl Log Message: french translation fixes Index: AcceptItemCopy.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/Attic/AcceptItemCopy.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** AcceptItemCopy.tmpl 26 Jan 2004 10:47:57 -0000 1.1.2.2 --- AcceptItemCopy.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 2,6 ****
        ! Code barre '' has already been assigned.

        --- 2,6 ----

        ! Code barre a d?j? ?t? affect?.

        Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/Attic/marcimportdetail.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** marcimportdetail.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- marcimportdetail.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 20,24 ****

    Titre S?ries" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Nombre" size=40 maxlenght=255>
    Date Volume" size=40 maxlenght=255>
    Description Volume" size=40 maxlenght=255>
    Titre S?ries" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Nombre;LIMITED" size=40 maxlenght=255>
    Date Volume" size=40 maxlenght=255>
    Description Volume" size=40 maxlenght=255>
    !
    !
    !

     

    --- 39,43 ----
    !

     

    Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -r1.3.2.1 -r1.3.2.2 *** readingrec.tmpl 20 Jan 2004 09:11:08 -0000 1.3.2.1 --- readingrec.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.2 *************** *** 19,23 ****     		/images/background-mem.gif"> ! &limit=">DATE DUE /images/background-mem.gif"> --- 19,23 ---- /images/background-mem.gif"> ! &limit=">DATE RETOUR /images/background-mem.gif"> From tipaul at users.sourceforge.net Tue Feb 10 15:07:46 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:46 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_60X.tmpl,1.2.2.2,1.2.2.3 unimarc_field_700_701_702.tmpl,1.1.2.2,1.1.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22441/koha-tmpl/intranet-tmpl/default/fr/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: french translation fixes Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -r1.2.2.2 -r1.2.2.3 *** unimarc_field_60X.tmpl 26 Jan 2004 10:48:53 -0000 1.2.2.2 --- unimarc_field_60X.tmpl 10 Feb 2004 14:07:44 -0000 1.2.2.3 *************** *** 101,105 ****
    "> ! "> Create a new authority/thesaurus entry : "> --- 101,105 ---- "> ! "> Create a new authority/thesaurus entry : "> Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/Attic/unimarc_field_700_701_702.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** unimarc_field_700_701_702.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- unimarc_field_700_701_702.tmpl 10 Feb 2004 14:07:44 -0000 1.1.2.3 *************** *** 29,33 **** "> ! Ins?rer une nouvelle autorit? : "> --- 29,33 ---- "> ! Ins?rer une nouvelle autorit? : "> From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318/koha-tmpl/intranet-tmpl/default/fr/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE ---
    Notice bibliographique



    Publi? par : en , ,
    Collection:
    Sujet:
    Ann?e :
    Notes:
    Titre uniforme:
    Dewey: ">
    Classification:
    LCCN:
    URL: ">
    ISBN:
    ,
    From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha detailprint.pl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318 Added Files: Tag: rel_2_0 detailprint.pl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE --- #!/usr/bin/perl # NOTE: Use standard 8-space tabs for this file (indents are 4 spaces) # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA use HTML::Template; use strict; require Exporter; use C4::Context; use C4::Output; # contains gettemplate use CGI; use C4::Search; use C4::Auth; use C4::Interface::CGI::Output; use C4::Date; my $query=new CGI; my $type=$query->param('type'); ($type) || ($type='intra'); my $biblionumber=$query->param('bib'); # change back when ive fixed request.pl my @items = ItemInfo(undef, $biblionumber, $type); my $norequests = 1; foreach my $itm (@items) { $norequests = 0 unless $itm->{'notforloan'}; } my $dat=bibdata($biblionumber); my ($authorcount, $addauthor)= &addauthor($biblionumber); my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber); my ($websitecount, @websites) = &getwebsites($biblionumber); $dat->{'count'}=@items; $dat->{'norequests'} = $norequests; $dat->{'additional'}=$addauthor->[0]->{'author'}; for (my $i = 1; $i < $authorcount; $i++) { $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'}; } # for my @results; $results[0]=$dat; my $resultsarray=\@results; my $itemsarray=\@items; my $webarray=\@webbiblioitems; my $sitearray=\@websites; my $startfrom=$query->param('startfrom'); ($startfrom) || ($startfrom=0); my ($template, $loggedinuser, $cookie) = get_template_and_user({ template_name => ('catalogue/detailprint.tmpl'), query => $query, type => "intranet", authnotrequired => ($type eq 'opac'), flagsrequired => {catalogue => 1}, }); my $count=1; # now to get the items into a hash we can use and whack that thru my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20); my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0); $template->param(startfrom => $startfrom+1, endat => $startfrom+20, numrecords => $count, nextstartfrom => $nextstartfrom, prevstartfrom => $prevstartfrom, BIBLIO_RESULTS => $resultsarray, ITEM_RESULTS => $itemsarray, WEB_RESULTS => $webarray, SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, biblionumber => $biblionumber, ); output_html_with_http_headers $query, $cookie, $template->output; # Local Variables: # tab-width: 8 # End: From tipaul at users.sourceforge.net Tue Feb 10 15:12:08 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:12:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23318/koha-tmpl/intranet-tmpl/default/en/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: new feature : printing card with biblio (for paper searches) --- NEW FILE ---
    BIBLIO RECORD



    Published by : in , ,
    Collection:
    Subject:
    Year :
    Notes:
    Unititle:
    Dewey: ">
    Classification:
    LCCN:
    URL: ">
    ISBN:
    ,
    From tipaul at users.sourceforge.net Tue Feb 10 17:43:44 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 08:43:44 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr opac-auth.tmpl,1.1.2.2,1.1.2.3 opac-detail.tmpl,1.1.2.2,1.1.2.3 opac-main.tmpl,1.1.2.2,1.1.2.3 opac-moredetail.tmpl,1.1.2.2,1.1.2.3 opac-reserve.tmpl,1.1.2.2,1.1.2.3 opac-searchresults.tmpl,1.1.2.3,1.1.2.4 opac-userupdate.tmpl,1.1.2.1,1.1.2.2 subject.tmpl,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26103/koha-tmpl/opac-tmpl/css/fr Modified Files: Tag: rel_2_0 opac-auth.tmpl opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-searchresults.tmpl opac-userupdate.tmpl subject.tmpl Log Message: french translation fixes Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-auth.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-auth.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-auth.tmpl 10 Feb 2004 16:43:41 -0000 1.1.2.3 *************** *** 3,22 **** !

    D?sol?, je pense que vous n'avez pas les permissions suffisantes\.

    !

    D?connect?\. Identifiez vous ? nouveau\.

    !

    Vous avez chang? d'adresse IP\. Identifiez vous ? nouveau

    !

    Identifiant ou mot de passe erron?\. Essayez encore\.

    --- 3,22 ---- !

    D?sol?, je pense que vous n'avez pas les permissions suffisantes.

    !

    D?connect?. Identifiez vous ? nouveau.

    !

    Vous avez chang? d'adresse IP. Identifiez vous ? nouveau

    !

    Identifiant ou mot de passe erron?. Essayez encore.

    Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/Attic/opac-detail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-detail.tmpl 20 Jan 2004 10:24:27 -0000 1.1.2.2 --- opac-detail.tmpl 10 Feb 2004 16:43:42 -0000 1.1.2.3 *************** *** 56,60 ****

    CODE BARRE !
    CODE BARRE !
    © Nombre d'ouvragesLIMITED:Localisation  
    © Nombre d'ouvragesLocalisation  

    ! Results ? de r?ponses
    --- 15,19 ----
    ! R?sultats ? de r?ponses
    From tipaul at users.sourceforge.net Tue Feb 10 15:07:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Tue, 10 Feb 2004 06:07:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters admin-home.tmpl,1.5.2.3,1.5.2.4 aqbookfund.tmpl,1.4.2.3,1.4.2.4 aqbudget.tmpl,1.4.2.3,1.4.2.4 authorised_values.tmpl,1.6.2.3,1.6.2.4 branches.tmpl,1.6.2.3,1.6.2.4 categorie.tmpl,1.5.2.3,1.5.2.4 categoryitem.tmpl,1.1.2.2,1.1.2.3 charges.tmpl,1.1.2.3,1.1.2.4 checkmarc.tmpl,1.3.2.3,1.3.2.4 currency.tmpl,1.1.2.2,1.1.2.3 itemtypes.tmpl,1.2.2.3,1.2.2.4 marc_subfields_structure.tmpl,1.3.2.3,1.3.2.4 marctagstructure.tmpl,1.7.2.3,1.7.2.4 printers.tmpl,1.1.2.3,1.1.2.4 stopwords.tmpl,1.2.2.3,1.2.2.4 systempreferences.tmpl,1.3.2.2,1.3.2.3 thesaurus.tmpl,1.5.2.3,1.5.2.4 z3950servers.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22075/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: Tag: rel_2_0 admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: french translation fixes Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** admin-home.tmpl 28 Jan 2004 16:45:31 -0000 1.5.2.3 --- admin-home.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 2,12 ****

    Param?tres


    !
    Param?tres syst?me
    ! --- 2,14 ----

    Param?tres


    !
    Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
    Annexes
    Param?tres syst?me
    ! ! + *************** *** 56,63 **** ! --- 58,67 ---- + + ! *************** *** 75,90 ****
    Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
    AnnexesContr?le la structure MARC. A utiliser avant de travailler avec de vraies donn?es. Cela permet de mettre en ?vidence les erreurs qui peuvent corrompre la base de donn?es.
    Divers param?tres
    ImprimantesImprimantes (UNIX paths).
    Contr?le la structure MARC. A utiliser avant de travailler avec de vraies donn?es. Cela permet de mettre en ?vidence les erreurs qui peuvent corrompre la base de donn?es.
    Divers param?tres
    ImprimantesImprinantes (chemin UNIX).
    !
    Outils
    ! --- 79,98 ----
    Export
    Exporter une notice biblio MARC Exporter en format MARC.
    Importer
    Charger des notices MARC dans le r?servoir
    !
    Outils
    ! ! + + + Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** aqbookfund.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- aqbookfund.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 3,7 ****

    Admin Compte

    method=post> !
    Votre recherche sur


    --- 3,7 ----

    Admin Compte

    method=post> !
    Votre recherche sur


    *************** *** 24,28 ****

    ! --- 24,28 ---- ! *************** *** 43,47 ****       

    !

     

    --- 43,47 ----       

    !

     

    *************** *** 64,68 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 64,68 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 130,134 ****     !

     

    --- 130,134 ----     !

     

    Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -r1.4.2.3 -r1.4.2.4 *** aqbudget.tmpl 28 Jan 2004 16:45:31 -0000 1.4.2.3 --- aqbudget.tmpl 10 Feb 2004 14:06:52 -0000 1.4.2.4 *************** *** 3,7 ****

    Admin Budget

    !
    Votre recherche sur


    --- 3,7 ----

    Admin Budget

    !
    Votre recherche sur


    *************** *** 23,27 ****

    !
    --- 23,27 ----

    !
    *************** *** 43,47 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 43,47 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 92,102 **** !

    !
    Export
    Exporter une notice biblio MARC Exporter en format MARC.
    Importer
    Charger des notices MARC dans le r?servoir   Budget">//images/filenew.png" ALT="Ajouter budget" border=0>
      Budget">//images/filenew.png" ALT="Add budget" border=0>
    Nom
    CONFIRMER SUPPRESSION
    Nom
    CONFIRMER SUPPRESSION
    Date de d?but () 
    Date de fin ()
    Montant budget
     ">
    !

     

    --- 92,102 ---- ! Date de d?but ()  ! Date de fin () Montant budget  "> !

     

    Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -r1.6.2.3 -r1.6.2.4 *** authorised_values.tmpl 28 Jan 2004 16:45:31 -0000 1.6.2.3 --- authorised_values.tmpl 10 Feb 2004 14:06:52 -0000 1.6.2.4 *************** *** 51,56 ****

    Admin Valeurs autoris?es

    Cette table est utilis?e dans les d?finitions MARC. Vous pouvez d?finir autant de cat?gories et autant de valeurs autoris?es pour chaque cat?gorie que vous voulez.

    !

    When you define the MARC subfield structure, you can link a subfield to an authorised-value category. When the user adds ou modifies a biblio, ! the subfield is not entered ? a free field, but though a list sur authorised values.

    Nouvelle cat?gorie... --- 51,55 ----

    Admin Valeurs autoris?es

    Cette table est utilis?e dans les d?finitions MARC. Vous pouvez d?finir autant de cat?gories et autant de valeurs autoris?es pour chaque cat?gorie que vous voulez.

    !

    Quand vous d?finissez la structure des sous-champs MARC, vous pouvez lier un sous-champ ? une cat?gorie de valeurs autoris?es. Quand l'utilisateur ajoute ou modifie une notice biblio, la valeur du sous-champ n'est pas libre, mais doit appartenir ? la liste des valeurs autoris?es.

    Nouvelle cat?gorie... Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -r1.6.2.3 -r1.6.2.4 *** branches.tmpl 28 Jan 2004 16:45:32 -0000 1.6.2.3 --- branches.tmpl 10 Feb 2004 14:06:52 -0000 1.6.2.4 *************** *** 1,5 **** !


    --- 1,6 ---- ! !


    *************** *** 57,61 ****   ! --- 58,62 ----   ! *************** *** 98,102 **** ! (nothing entered) --- 99,103 ---- ! (pas de saisie) *************** *** 116,120 **** ! (no categories set) --- 117,121 ---- ! (pas de cat?gorie d?finie) *************** *** 127,131 **** !
    --- 128,132 ---- ! *************** *** 141,145 ****
    method=post> !
    --- 142,146 ----
    method=post> !
    Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** categorie.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- categorie.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 96,100 **** ! P?riode d'inscription --- 96,100 ---- ! Dur?e inscription *************** *** 102,106 **** ! Limite d'?ge sup?rieure --- 102,106 ---- ! Age maxi *************** *** 108,112 **** ! Age obligatoire --- 108,112 ---- ! Age mini *************** *** 178,190 **** ! P?riode d'inscription ! Limite d'?ge sup?rieure ! Age obligatoire --- 178,190 ---- ! Dur?e inscription ! Age maxi ! Age mini *************** *** 194,201 **** - en gros - - - Frais d'inscription --- 194,197 ---- *************** *** 238,242 **** Donn?e effac?e !
    --- 234,238 ---- Donn?e effac?e !
    *************** *** 247,269 ****

    Admin Cat?gorie

    ! Votre recherche sur !
    ! > !
    ! ! ! ! ! ! ! --- 243,264 ----

    Admin Cat?gorie

    ! Votre recherche sur ! ! > ! !
    Cat?gorie DescriptionInscriptionLimite d'?ge sup?rieureAge obligatoire Amendeen grosFraisEn retard Limite de pr?t R?server
    ! ! ! ! ! *************** *** 276,285 **** ! ! ! --- 271,284 ---- + ! Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/Attic/categoryitem.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** categoryitem.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- categoryitem.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 93,97 **** ! ! ! ! ! ! ! ! ! ! ! --- 181,193 ---- ! ! ! *************** *** 201,205 **** ! --- 201,205 ---- ! *************** *** 255,259 **** > ! --- 255,259 ---- > ! *************** *** 263,272 **** ! ! ! --- 263,272 ---- ! ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** charges.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- charges.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 1,8 ****

    ! Chaque champ/bo?te doit ?tre remplie avec le montant de l'amende, quand d?bute son calcul, son cycle
    ! eg 1,7,7 = $1 fine, after 7 days, every 7 days

    !

    Note : fines are calculated by the fines2.pl script, located in misc directory. ! Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

    --- 1,7 ----

    ! Chaque champ/bo?te doit ?tre remplie avec le montant de l'amende, quand d?bute son calcul, sa p?riodicit?
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, apr?s 7 jours, chaque 7 jours

    !

    Note : les amendes sont calcul?es par le misc/script fines2.pl. Demandez ? votre administrateur de mettre ce script dans le crontab, apr?s minuit, pour que les amendes soient calcul?es chaque nuit

    Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** checkmarc.tmpl 28 Jan 2004 16:45:32 -0000 1.3.2.3 --- checkmarc.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.4 *************** *** 11,15 **** --- 11,15 ---- *************** *** 25,29 **** --- 25,29 ---- *************** *** 105,110 **** --- 105,110 ---- *************** *** 118,122 **** ! --- 118,122 ---- ! Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** currency.tmpl 26 Jan 2004 10:48:53 -0000 1.1.2.2 --- currency.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.3 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 164,168 **** > ! --- 164,168 ---- > ! *************** *** 182,187 **** ! ! --- 182,187 ---- ! ! Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** itemtypes.tmpl 28 Jan 2004 16:45:32 -0000 1.2.2.3 --- itemtypes.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.4 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 81,90 **** ! ! --- 81,99 ---- ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** marc_subfields_structure.tmpl 28 Jan 2004 16:45:32 -0000 1.3.2.3 --- marc_subfields_structure.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.4 *************** *** 11,15 ****
    Cat?gorie DescriptionDur?e inscriptionFrais d'inscriptionAge maxiAge mini AmendeSignaler retard Limite de pr?t R?server OuiNon ! Oui ! ! Non ! !
    P?riode d'inscription > --- 93,97 ----
    Dur?e d'inscription > *************** *** 99,103 ****
    Limite d'?ge sup?rieure > --- 99,103 ----
    Age maxi > *************** *** 105,109 ****
    Age obligatoire > --- 105,109 ----
    Age mini > *************** *** 123,127 ****
    Frais d'inscription > --- 123,127 ----
    Frais inscription > *************** *** 181,193 ****
    P?riode d'inscription
    Limite d'?ge sup?rieure
    Age obligatoire
    Dur?e d'inscription
    Age maxi
    Age mini
    Frais d'inscription
    Frais inscription
    Description InscriptionLimite d'?ge sup?rieureAge obligatoire Amende en gros FraisEn retard Limite de pr?t R?serverDescription InscriptionAge maxiAge mini Amende en gros FraisSignaler retard Limite de pr?t R?server
    itemnum
  • Le champ itemnumb DOIT ?tre connect?
    • !
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    itemnum
  • Le champ itemnumb DOIT ?tre connect?
    • !
  • Le sous-champ correspondant DOIT ?tre dans l'onglet -1 (ignore)
    		•
    TOUS les champs ouvrage DOIVENT :
  • ?tre reli? ? la m?me ?tiquette,
    • !
  • et they doit tous be in the 10 (items) tab
    		•
    TOUS les champs ouvrage DOIVENT :
  • ?tre reli? ? la m?me ?tiquette,
    • !
  • et ils doivent tous ?tre dans l'onglet 10 (items)
    		•
    Les champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
  • ?tre reli? ? l'?tiquette MARC,
    • !
  • be in the SAME tag (for example : 090$a et 090$b)
    • !
  • \$etre dans l'onglet -1 \(items\)
    		•
    Les champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
  • ?tre reli? ? l'?tiquette MARC,
    • !
  • ?tre dans la MEME ?tiquette (par ex. : 090$a et 090$b)
    • !
  • ?tre dans l'onglet -1 (items)
    		•
    TOTALVous have error(s) in your MARC configuration. Please fix them before using koha
    TOTALVous avez erreurs dans votre configuration MARC. Corrigez-les avant d'utiliser Koha
    EditerSupprimer
    EditerSupprimer
    Non empruntablechecked value=1> (if checked, no item sur this type can be issued. ! If not checked, every item sur this type can be issued unless notforloan is set for a specific item)
    Dur?e de pr?t (meaningful only if not for loan is not set)
    Non empruntable ! ! ! ! ! ! Si coch?, aucun ouvrage de ce type ne peut ?tre emprunt?. Sinon, les ouvrages peuvent ?tre emprunt?s sauf si le champ "notforloan" de l'ouvrage est coch?. !
    Dur?e de pr?t ! ! Utilis? seulement si "Non empruntable" n'est pas coch?. !
    ! --- 11,15 ----
    ChampLib for librarians / for opac Repet obligatoire
    ! *************** *** 68,75 **** ! MARC subfield structure admin for !

    This screen shows the subfields associated with the selected tag. Vous can edit subfields ou ajouter a new one by clicking on "edit".

    !

    The column champ Koha shows that the subfield is linked with a "champ Koha". Koha can manage a MARC interface, ou a Koha interface. This link ensures that ! both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    ChampLibell? OPAC Repet obligatoire
    --- 68,74 ---- !

    MARC subfield structure admin for

    !

    This screen shows the subfields associated with the selected tag. Vous can edit subfields ou add a new one by clicking on edit.

    !

    The column champ Koha shows that the subfield is linked with a champ Koha. Koha can manage a MARC interface, ou a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    *************** *** 78,84 **** ! ! ! --- 77,83 ---- ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -C2 -r1.7.2.3 -r1.7.2.4 *** marctagstructure.tmpl 28 Jan 2004 16:45:32 -0000 1.7.2.3 --- marctagstructure.tmpl 10 Feb 2004 14:06:52 -0000 1.7.2.4 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 59,67 ****
    Lib champ Koha ?Rep ?obligatoire ?Onglet ? Valeur autoris?e ? Th?saurus ?Lib champ Koha ?Rep ?obligatoire ?Onglet ? Valeur autoris?e ? Th?saurus ?
    ! ! !
    Etiquette
    Lib for librarians
    Lib for opac
    R?p?table
    Obligatoire
    Valeur autoris?e (if you select a value ici, the indicators will be limited to the authorised value list)
     
    --- 59,67 ---- ! ! !
    Etiquette
    Libell? biblioth?caire
    Lib pour l'opac
    R?p?table
    Obligatoire
    Valeur autoris?e (Si vous s?lectionnez une valeur ici, les indicateurs seront limit?s une liste de valeurs autoris?es)
     
    *************** *** 97,101 ****
    !
    --- 97,101 ----
    !
    Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** printers.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- printers.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 155,159 ****
    > !
    --- 155,159 ----
    > !
    Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** stopwords.tmpl 28 Jan 2004 16:45:32 -0000 1.2.2.3 --- stopwords.tmpl 10 Feb 2004 14:06:52 -0000 1.2.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 133,137 ****
    > !
    --- 133,137 ----
    > !
    Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -r1.3.2.2 -r1.3.2.3 *** systempreferences.tmpl 26 Jan 2004 10:48:53 -0000 1.3.2.2 --- systempreferences.tmpl 10 Feb 2004 14:06:52 -0000 1.3.2.3 *************** *** 17,21 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 17,21 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 56,60 **** !

    Modifier une pr?f?rence syst?me

    --- 56,60 ---- !

    Modifier une pr?f?rence syst?me

    *************** *** 78,82 **** ! Donn?e enregistr?e
    --- 78,82 ---- ! Donn?e enregistr?e *************** *** 86,92 **** ! ! --- 86,92 ---- !
    Variable
    ! *************** *** 95,99 **** !
    Variable
    CONFIRMER SUPPRESSION
    --- 95,99 ----
    CONFIRMER SUPPRESSION !
    *************** *** 101,105 **** ! Donn?e effac?e
    --- 101,105 ---- ! Donn?e effac?e *************** *** 108,121 **** !

    Admin Pr?f?rences syst?me

    !
    ! --- 108,121 ---- !

    Admin Pr?f?rences syst?me

    !
    Variable Valeur
    ! Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -C2 -r1.5.2.3 -r1.5.2.4 *** thesaurus.tmpl 28 Jan 2004 16:45:32 -0000 1.5.2.3 --- thesaurus.tmpl 10 Feb 2004 14:06:52 -0000 1.5.2.4 *************** *** 6,10 ****
    Variable Valeur
    !
    Values related to ()
    --- 6,10 ---- !
    En liaison avec ()
    *************** *** 29,33 **** "> "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Ajouter" BORDER=0 >
    --- 29,33 ---- "> "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Add" BORDER=0 >
    *************** *** 99,104 ****

    Gestion du th?saurus et des fichiers autorit?s.

      ! Extraire: see data dependent one this one
      ! Li?: see other forms sur this authority entry

    --- 99,104 ----

    Gestion du th?saurus et des fichiers autorit?s.

      ! Extraire: Voir les formes associ?es
      ! Li?: Voir les formes rejet?es

    *************** *** 125,129 **** ! Extraire Li? ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> --- 125,129 ---- ! Extraire   Li? ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> *************** *** 137,142 **** ! !
    " class="button">Pr?c?dents" class="button"> Suivant
    --- 137,142 ---- ! !
    " class="button">Previous" class="button"> Next
    *************** *** 147,151 **** "> "> !

    --- 147,151 ---- "> "> !

    Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** z3950servers.tmpl 28 Jan 2004 16:45:32 -0000 1.1.2.3 --- z3950servers.tmpl 10 Feb 2004 14:06:52 -0000 1.1.2.4 *************** *** 18,22 **** ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Nombre(v.value); if (isNaN(n)) { return false; --- 18,22 ---- ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// function isNum(v,maybenull) { ! var n = new Number(v.value); if (isNaN(n)) { return false; *************** *** 128,136 **** ! V?rifi? (searched by default) ! Rang (display order) --- 128,136 ---- ! Coch? (recherche par d?faut) ! Rang (ordre d'affichage) *************** *** 138,142 **** ! Syntaxe (z3950 can send enregistrements in various format. Choose one) *************** *** 228,232 ****
    > !
    --- 228,232 ----
    > !
    From tipaul at users.sourceforge.net Wed Feb 11 09:22:38 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:22:38 -0800 Subject: [Koha-cvs] CVS: koha/misc release_notes_200RC4.txt,1.1.2.1,1.1.2.2 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19999 Modified Files: Tag: rel_2_0 release_notes_200RC4.txt Log Message: synch'ing release notes Index: release_notes_200RC4.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/Attic/release_notes_200RC4.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** release_notes_200RC4.txt 10 Feb 2004 13:22:26 -0000 1.1.2.1 --- release_notes_200RC4.txt 11 Feb 2004 08:22:36 -0000 1.1.2.2 *************** *** 6,14 **** If you test it and let us know about any we haven't seen yet, it will help us to fix them. - The 2.0.x series version is "feature freezed". Only bugs or minor changes will be made in this branch. - The koha team is already working on the 2.2.x version. - In CVS (HEAD branch), developpers can already get 1st draft of a working z3950 server. - - INSTALLATION --- 6,9 ---- *************** *** 20,24 **** ! UPGRADE from previous 2.0.0preX version * Download the package --- 15,19 ---- ! UPGRADE from previous 2.0.0preX or RCx version * Download the package *************** *** 51,60 **** Now Koha 2.0.0RC4 is ready for you to test. - BUGFIXES/IMPROVEMENTS: BUGS FIXED: * indicators where stored but not displayed in MARC editor/viewer. * book shelves work again (note bookshelves are not avaible in OPAC. they will be added in 2.2.0) * it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and recieve a past order) * removing "bulk", useless field, in admin/categorie.pl list (NOT in DB, in case someone uses the field) --- 46,60 ---- Now Koha 2.0.0RC4 is ready for you to test. BUGFIXES/IMPROVEMENTS: BUGS FIXED: + major : + * #293 : Error Issuing Book - 1 (a very old one...) + * #605 : circulation.pl only shows one waiting item + * #661 : Set three variables for the circ template: gna, lost, and dbarred + * biblio deletion : in some cases, the biblio deletion was done on another biblio than the one asked. * indicators where stored but not displayed in MARC editor/viewer. * book shelves work again (note bookshelves are not avaible in OPAC. they will be added in 2.2.0) + minor : * it's now impossible to create a basket for an inactive supplier (it's of course possible to change supplier datas and recieve a past order) * removing "bulk", useless field, in admin/categorie.pl list (NOT in DB, in case someone uses the field) *************** *** 62,70 **** * Next borrower didn't work in circulation.pl (didn't return to borrower form) * in circulation.pl, removing
    to have all informations without sidebar on a 1024x768 screen. ! * in curculation.pl, ODUES are in red in borrower header IMPROVEMENTS: * Minor translation & HTML fixes. * Adding >>> in biblio editor to change tab. ! ! DB change in RC2: --- 62,70 ---- * Next borrower didn't work in circulation.pl (didn't return to borrower form) * in circulation.pl, removing
    to have all informations without sidebar on a 1024x768 screen. ! * in circulation.pl, ODUES are in red in borrower header ! * quoting correctly titles with a " inside, in MARC editor IMPROVEMENTS: * Minor translation & HTML fixes. * Adding >>> in biblio editor to change tab. ! * Adding a "print" link in MARCbiblio : popup a small windows, print the biblio, and closes. Nice for libraries still having a paper catalog. \ No newline at end of file From tipaul at users.sourceforge.net Wed Feb 11 09:35:34 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:35:34 -0800 Subject: [Koha-cvs] CVS: koha detailprint.pl,1.1,1.2 catalogue-home.pl,1.9,1.10 detail.pl,1.22,1.23 insertidata.pl,1.5,1.6 memberentry.pl,1.38,1.39 newmember.pl,1.18,1.19 search.pl,1.33,1.34 shelves.pl,1.12,1.13 thesaurus_popup.pl,1.14,1.15 release_notes_191.txt,1.1,NONE release_notes_192.txt,1.1,NONE release_notes_193.txt,1.1,NONE release_notes_200pre1.txt,1.2,NONE release_notes_200pre2.txt,1.2,NONE release_notes_200pre3.txt,1.1,NONE release_notes_200pre4.txt,1.1,NONE release_notes_200pre5.txt,1.1,NONE release_notes_200RC1.txt,1.4,NONE Message-ID: Update of /cvsroot/koha/koha In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22477 Modified Files: catalogue-home.pl detail.pl insertidata.pl memberentry.pl newmember.pl search.pl shelves.pl thesaurus_popup.pl Added Files: detailprint.pl Removed Files: release_notes_191.txt release_notes_192.txt release_notes_193.txt release_notes_200pre1.txt release_notes_200pre2.txt release_notes_200pre3.txt release_notes_200pre4.txt release_notes_200pre5.txt release_notes_200RC1.txt Log Message: synch'ing 2.0.0 branch and head Index: catalogue-home.pl =================================================================== RCS file: /cvsroot/koha/koha/catalogue-home.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** catalogue-home.pl 8 Aug 2003 13:46:26 -0000 1.9 --- catalogue-home.pl 11 Feb 2004 08:35:31 -0000 1.10 *************** *** 17,21 **** type => "intranet", authnotrequired => 0, ! flagsrequired => {parameters => 1}, debug => 1, }); --- 17,21 ---- type => "intranet", authnotrequired => 0, ! flagsrequired => {catalogue => 1}, debug => 1, }); Index: detail.pl =================================================================== RCS file: /cvsroot/koha/koha/detail.pl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** detail.pl 8 May 2003 13:19:40 -0000 1.22 --- detail.pl 11 Feb 2004 08:35:31 -0000 1.23 *************** *** 96,100 **** SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, ! biblionumber => $biblionumber); output_html_with_http_headers $query, $cookie, $template->output; --- 96,101 ---- SITE_RESULTS => $sitearray, loggedinuser => $loggedinuser, ! biblionumber => $biblionumber, ! ); output_html_with_http_headers $query, $cookie, $template->output; Index: insertidata.pl =================================================================== RCS file: /cvsroot/koha/koha/insertidata.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** insertidata.pl 6 Jun 2003 10:00:52 -0000 1.5 --- insertidata.pl 11 Feb 2004 08:35:31 -0000 1.6 *************** *** 40,86 **** my $problems; my $env; foreach my $key (@names){ $data{$key}=$input->param($key); } my $dbh = C4::Context->dbh; ! my $query="Select * from borrowers where borrowernumber=$data{'borrowernumber'}"; ! my $sth=$dbh->prepare($query); ! $sth->execute; if (my $data2=$sth->fetchrow_hashref){ ! $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}', ! cardnumber='$data{'cardnumber_institution'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}', ! streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}', ! altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}', ! emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}', ! altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}', ! city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}', ! borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'institution_name'}', ! initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}', ! gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}', ! textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}', ! zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}' ! where borrowernumber=$data{'borrowernumber'}"; } else { my $surname=$data{'institution_name'}; ! $query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber, ! firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity, ! altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname, ! initials,ethnicity,borrowernumber,guarantor,school,branchcode,zipcode,homezipcode) ! values ('','$data{'expiry'}','$data{'cardnumber_institution'}', ! '','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}', ! '$data{'firstname'}','$data{'altnotes'}','','$data{'contactname'}', ! '$data{'emailaddress'}', ! now(),'$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}', ! '$data{'phoneday'}','I','$data{'city'}','$data{'area'}','$data{'phone'}', ! '$data{'borrowernotes'}','$data{'altphone'}','$surname','$data{'initials'}', ! '$data{'ethnicity'}','$data{'borrowernumber'}','','','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}')"; } - #print $query; - my $sth2=$dbh->prepare($query); - warn "==> $query"; - $sth2->execute; $sth2->finish; ! #$sth->finish; print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}"); --- 40,107 ---- my $problems; my $env; + my $sth2; foreach my $key (@names){ $data{$key}=$input->param($key); } my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?"); ! $sth->execute($data{'borrowernumber'}); if (my $data2=$sth->fetchrow_hashref){ ! $sth2=$dbh->prepare("update borrowers set title=?,expiry=?, ! cardnumber=?,sex=?,ethnotes=?, ! streetaddress=?,faxnumber=?,firstname=?, ! altnotes=?,dateofbirth=?,contactname=?, ! emailaddress=?,dateenrolled=?,streetcity=?, ! altrelationship=?,othernames=?,phoneday=?, ! city=?,area=?,phone=?, ! borrowernotes=?,altphone=?,surname=?, ! initials=?,physstreet=?,ethnicity=?, ! gonenoaddress=?,lost=?,debarred=?, ! textmessaging=?, branchcode = ?, ! zipcode = ?,homezipcode=? ! where borrowernumber=?"); ! $sth2->execute($data{'title'},$data{'expiry'}, ! $data{'cardnumber_institution'},$data{'sex'},$data{'ethnicnotes'}, ! $data{'address'},$data{'faxnumber'},$data{'firstname'}, ! $data{'altnotes'},$data{'dateofbirth'},$data{'contactname'}, ! $data{'emailaddress'},$data{'joining'},$data{'streetcity'}, ! $data{'altrelationship'},$data{'othernames'},$data{'phoneday'}, ! $data{'city'},$data{'area'},$data{'phone'}, ! $data{'borrowernotes'},$data{'altphone'},$data{'institution_name'}, ! $data{'initials'},$data{'streetaddress'},$data{'ethnicity'}, ! $data{'gna'},$data{'lost'},$data{'debarred'}, ! $data{'textmessaging'},$data{'branchcode'}, ! $data{'zipcode'},$data{'homezipcode'}, ! $data{'borrowernumber'}); } else { my $surname=$data{'institution_name'}; ! # note for code reading : 5 on each line ! $sth2=$dbh->prepare("insert into borrowers ( ! title, expiry, cardnumber, sex, ethnotes, ! streetaddress, faxnumber, firstname, altnotes, dateofbirth, ! contactname, emailaddress, dateenrolled, streetcity, altrelationship, ! othernames, phoneday, categorycode, city, area, ! phone, borrowernotes, altphone, surname, initials, ! ethnicity, borrowernumber,guarantor, school, branchcode, ! zipcode, homezipcode) ! values ( ?,?,?,?,?, ! ?,?,?,?,?, ! ?,?,now(),?,?, ! ?,?,?,?,?, ! ?,?,?,?,?, ! ?,?,?,?,?, ! ?,? ! )"); ! $sth2->execute('', $data{'expiry'}, $data{'cardnumber_institution'}, '', $data{'ethnotes'}, ! $data{'address'}, $data{'faxnumber'}, $surname, $data{'altnotes'}, '', ! $data{'contactname'},$data{'emailaddress'}, $data{'streetcity'}, $data{'altrelationship'}, # only 4 because of now() ! $data{'othernames'}, $data{'phoneday'}, 'I', $data{'city'}, $data{'area'}, ! ''.$data{'phone'}, $data{'borrowernotes'}, $data{'altphone'}, $surname, ''.$data{'initials'}, ! $data{'ethnicity'}, $data{'borrowernumber'}, '', '', $data{'branchcode'}, ! $data{'zipcode'}, $data{'homezipcode'}); } $sth2->finish; ! $sth->finish; print $input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}"); Index: memberentry.pl =================================================================== RCS file: /cvsroot/koha/koha/memberentry.pl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** memberentry.pl 31 Dec 2003 18:08:33 -0000 1.38 --- memberentry.pl 11 Feb 2004 08:35:31 -0000 1.39 *************** *** 60,67 **** print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member"); } else { # this else goes down the whole script ! if ($type ne 'Add'){ ! $template->param( header => 'Update Member Details'); # bad templating style } else { ! $template->param( header => 'Add New Member'); } --- 60,67 ---- print $input->redirect("/cgi-bin/koha/deletemem.pl?member=$member"); } else { # this else goes down the whole script ! if ($type eq 'Add'){ ! $template->param( addAction => 1); } else { ! $template->param( addAction =>0); } Index: newmember.pl =================================================================== RCS file: /cvsroot/koha/koha/newmember.pl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** newmember.pl 18 Dec 2003 17:02:13 -0000 1.18 --- newmember.pl 11 Feb 2004 08:35:31 -0000 1.19 *************** *** 127,133 **** my $sex; if ($data{'sex'} eq 'M'){ ! $sex="Male"; } else { ! $sex="Female"; } if ($data{'joining'} eq ''){ --- 127,133 ---- my $sex; if ($data{'sex'} eq 'M'){ ! $sex=1; } else { ! $sex=0; } if ($data{'joining'} eq ''){ Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.pl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** search.pl 19 Dec 2003 17:28:03 -0000 1.33 --- search.pl 11 Feb 2004 08:35:31 -0000 1.34 *************** *** 20,26 **** --- 20,35 ---- # $Log$ + # Revision 1.34 2004/02/11 08:35:31 tipaul + # synch'ing 2.0.0 branch and head + # # Revision 1.33 2003/12/19 17:28:03 tipaul # fix for #683 # + # Revision 1.32.2.2 2004/01/13 17:33:39 tipaul + # removing useless (& buggy here) checkauth + # + # Revision 1.32.2.1 2003/12/19 17:28:42 tipaul + # fix for 683 + # # Revision 1.32 2003/06/11 18:37:55 tonnesen # Using boolean_preference instead of preference for 'marc' setting *************** *** 43,50 **** my $type=$query->param('type'); - #(-e "opac") && ($type='opac'); - - my ($loggedinuser, $cookie, $sessionID) = checkauth($query, ($type eq 'opac') ? (1) : (0)); - my $startfrom=$query->param('startfrom'); ($startfrom) || ($startfrom=0); --- 52,55 ---- Index: shelves.pl =================================================================== RCS file: /cvsroot/koha/koha/shelves.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** shelves.pl 5 Feb 2003 10:04:14 -0000 1.12 --- shelves.pl 11 Feb 2004 08:35:31 -0000 1.13 *************** *** 5,10 **** # $Header$ # - - # Copyright 2000-2002 Katipo Communications # --- 5,8 ---- *************** *** 36,40 **** my $env; my $query = new CGI; - #print $query->header(-cookie => $cookie); my $headerbackgroundcolor='#663266'; my $circbackgroundcolor='#555555'; --- 34,37 ---- *************** *** 45,83 **** = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {parameters => 1}, ! }); ! #print startpage(); ! #print startmenu('catalogue'); ! #print "

    Logged in as: $loggedinuser [Log Out]

    \n"; ! ! ! my ($shelflist) = GetShelfList(); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); } - } } SWITCH: { ! $template->param({ loggedinuser => $loggedinuser, ! viewshelf => $query->param('viewshelf'), ! shelves => $query->param('shelves'), ! headerbackgroundcolor => $headerbackgroundcolor, ! circbackgroundcolor => $circbackgroundcolor }); ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 42,77 ---- = get_template_and_user({template_name => "shelves.tmpl", query => $query, ! type => "intranet", ! authnotrequired => 0, ! flagsrequired => {catalogue => 1}, ! }); if ($query->param('modifyshelfcontents')) { ! my $shelfnumber=$query->param('shelfnumber'); ! my $barcode=$query->param('addbarcode'); ! my ($item) = getiteminformation($env, 0, $barcode); ! AddToShelf($env, $item->{'itemnumber'}, $shelfnumber); ! foreach ($query->param) { ! if (/REM-(\d*)/) { ! my $itemnumber=$1; ! RemoveFromShelf($env, $itemnumber, $shelfnumber); ! } } } + my ($shelflist) = GetShelfList(); + $template->param({ loggedinuser => $loggedinuser, + headerbackgroundcolor => $headerbackgroundcolor, + circbackgroundcolor => $circbackgroundcolor }); SWITCH: { ! if ($query->param('viewshelf')) { viewshelf($query->param('viewshelf')); last SWITCH;} ! if ($query->param('shelves')) { shelves(); last SWITCH;} ! } ! ! ($shelflist) = GetShelfList(); # rebuild shelflist in case a shelf has been added ! ! my $color=''; ! my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 87,106 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); - } - $template->param(shelvesloop => \@shelvesloop); } output_html_with_http_headers $query, $cookie, $template->output; - sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); } - } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { --- 81,98 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'}; push (@shelvesloop, \%line); } + $template->param(shelvesloop => \@shelvesloop); output_html_with_http_headers $query, $cookie, $template->output; sub shelves { ! if (my $newshelf=$query->param('addshelf')) { ! my ($status, $string) = AddShelf($env,$newshelf); ! if ($status) { ! $template->param(status1 => $status, string1 => $string); ! } } my @paramsloop; ! foreach ($query->param()) { my %line; if (/DEL-(\d+)/) { *************** *** 114,123 **** #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 106,115 ---- #if the shelf is not deleted, %line points on null push(@paramsloop,\%line); ! } $template->param(paramsloop => \@paramsloop); ! my ($shelflist) = GetShelfList(); ! my $color=''; my @shelvesloop; ! foreach my $element (sort keys %$shelflist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 127,143 **** $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop); } - - sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); --- 119,135 ---- $line{'shelfbookcount'}=$shelflist->{$element}->{'count'} ; push(@shelvesloop, \%line); ! } ! $template->param(shelvesloop=>\@shelvesloop, ! shelves => 1, ! ); } sub viewshelf { ! my $shelfnumber=shift; ! my ($itemlist) = GetShelfContents($env, $shelfnumber); ! my $item=''; ! my $color=''; my @itemsloop; ! foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) { my %line; ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); *************** *** 148,162 **** $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop); ! $template->param( shelfname => $shelflist->{$shelfnumber}->{'shelfname'}); ! $template->param( shelfnumber => $shelfnumber); } - #print endpage(); - #print endmenu('catalogue'); - # # $Log$ # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains --- 140,159 ---- $line{'author'}=$item->{'author'}; push(@itemsloop, \%line); ! } ! $template->param( itemsloop => \@itemsloop, ! shelfname => $shelflist->{$shelfnumber}->{'shelfname'}, ! shelfnumber => $shelfnumber, ! viewshelf => $query->param('viewshelf'), ! ); } # # $Log$ + # Revision 1.13 2004/02/11 08:35:31 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.12.2.1 2004/02/06 14:22:19 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.12 2003/02/05 10:04:14 acli # Worked around weirdness with HTML::Template; without the {}, it complains Index: thesaurus_popup.pl =================================================================== RCS file: /cvsroot/koha/koha/thesaurus_popup.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** thesaurus_popup.pl 12 Jan 2004 16:58:20 -0000 1.14 --- thesaurus_popup.pl 11 Feb 2004 08:35:31 -0000 1.15 *************** *** 37,40 **** --- 37,41 ---- my $result = $input->param('result'); my $search_string= $input->param('search_string'); + $search_string = $result unless ($search_string); my $op = $input->param('op'); my $id = $input->param('id'); *************** *** 42,46 **** my $index= $input->param('index'); my $insert = $input->param('insert'); ! my $dbh = C4::Context->dbh; --- 43,47 ---- my $index= $input->param('index'); my $insert = $input->param('insert'); ! my $nohierarchy = $input->param('nohierarchy'); # if 1, just show the last part of entry (Marseille). If 0, show everything (Europe -- France --Marseille) my $dbh = C4::Context->dbh; *************** *** 52,58 **** my ($father,$freelib_text) = $sti->fetchrow_array; if (length($result)>0) { ! $result .= "|$father $freelib_text"; } else { ! $result = "$father $freelib_text"; } } --- 53,67 ---- my ($father,$freelib_text) = $sti->fetchrow_array; if (length($result)>0) { ! if ($nohierarchy) { ! $result .= "|$freelib_text"; ! } else { ! $result .= "|$father $freelib_text"; ! } } else { ! if ($nohierarchy) { ! $result = "$freelib_text"; ! } else { ! $result = "$father $freelib_text"; ! } } } *************** *** 78,82 **** $sti->execute($search_string,$category); while (my $line=$sti->fetchrow_hashref) { ! $stdlib{$line->{'id'}} = "$line->{'father'} $line->{'freelib'}"; push(@freelib,$line->{'id'}); } --- 87,95 ---- $sti->execute($search_string,$category); while (my $line=$sti->fetchrow_hashref) { ! if ($nohierarchy) { ! $stdlib{$line->{'id'}} = "$line->{'freelib'}"; ! } else { ! $stdlib{$line->{'id'}} = "$line->{'father'} $line->{'freelib'}"; ! } push(@freelib,$line->{'id'}); } *************** *** 106,110 **** result => $result, category => $category, ! index => $index ); output_html_with_http_headers $input, $cookie, $template->output; --- 119,124 ---- result => $result, category => $category, ! index => $index, ! nohierarchy => $nohierarchy, ); output_html_with_http_headers $input, $cookie, $template->output; --- release_notes_191.txt DELETED --- --- release_notes_192.txt DELETED --- --- release_notes_193.txt DELETED --- --- release_notes_200pre1.txt DELETED --- --- release_notes_200pre2.txt DELETED --- --- release_notes_200pre3.txt DELETED --- --- release_notes_200pre4.txt DELETED --- --- release_notes_200pre5.txt DELETED --- --- release_notes_200RC1.txt DELETED --- From tipaul at users.sourceforge.net Wed Feb 11 09:40:12 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:12 -0800 Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.66,1.67 Message-ID: Update of /cvsroot/koha/koha/C4/Circulation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/C4/Circulation Modified Files: Circ2.pm Log Message: synch'ing 2.0.0 branch and head Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** Circ2.pm 19 Dec 2003 14:44:46 -0000 1.66 --- Circ2.pm 11 Feb 2004 08:40:10 -0000 1.67 *************** *** 635,639 **** $noissue=1; } else { ! $rejected=-1; last SWITCH; } --- 635,639 ---- $noissue=1; } else { ! $rejected="Item on issue to this borrower, and you have chosen not to renew"; last SWITCH; } *************** *** 669,673 **** my $branches = getbranches(); my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'}; ! if ($responses->{2} eq '') { $questionnumber=2; # FIXME - Assumes HTML --- 669,673 ---- my $branches = getbranches(); my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'}; ! if ($responses->{2} eq '' && $responses->{3} eq '') { $questionnumber=2; # FIXME - Assumes HTML *************** *** 676,680 **** last SWITCH; } elsif ($responses->{2} eq 'N') { ! $rejected=-1; last SWITCH; } else { --- 676,680 ---- last SWITCH; } elsif ($responses->{2} eq 'N') { ! $rejected="Issue cancelled"; last SWITCH; } else { From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.33,1.34 additem.pl,1.21,1.22 Message-ID: Update of /cvsroot/koha/koha/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui.simple Modified Files: addbiblio.pl additem.pl Log Message: synch'ing 2.0.0 branch and head Index: addbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** addbiblio.pl 22 Dec 2003 19:16:58 -0000 1.33 --- addbiblio.pl 11 Feb 2004 08:40:11 -0000 1.34 *************** *** 161,164 **** --- 161,165 ---- sub create_input () { my ($tag,$subfield,$value,$i,$tabloop,$rec,$authorised_values_sth) = @_; + $value =~ s/"/"/g; my $dbh = C4::Context->dbh; my %subfield_data; *************** *** 197,201 **** my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values ! where category=? order by authorised_value"); # loop through each tab 0 through 9 --- 198,202 ---- my $authorised_values_sth = $dbh->prepare("select authorised_value,lib from authorised_values ! where category=? order by lib"); # loop through each tab 0 through 9 *************** *** 213,218 **** my $value=$field->data(); my $subfield="@"; ! push(@subfields_data, &create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth)) ! unless ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); $i++; } else { --- 214,219 ---- my $value=$field->data(); my $subfield="@"; ! next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! push(@subfields_data, &create_input($tag,$subfield,char_decode($value,$encoding),$i,$tabloop,$record,$authorised_values_sth)); $i++; } else { *************** *** 231,236 **** next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! next if ($tag > 10 && defined($record->field($tag)->subfield($subfield))); ! next if ($tag < 10 && defined($record->field($tag)->data())); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); $i++; --- 232,237 ---- next if subfield_is_koha_internal_p($subfield); next if ($tagslib->{$tag}->{$subfield}->{tab} ne $tabloop); ! next if ($tag<10); ! next if (defined($record->field($tag)->subfield($subfield))); push(@subfields_data, &create_input($tag,$subfield,'',$i,$tabloop,$record,$authorised_values_sth)); $i++; *************** *** 240,244 **** $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $indicator; $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); --- 241,245 ---- $tag_data{tag} = $tag; $tag_data{tag_lib} = $tagslib->{$tag}->{lib}; ! $tag_data{indicator} = $record->field($tag)->indicator(1). $record->field($tag)->indicator(2) if ($tag>=10); $tag_data{subfield_loop} = \@subfields_data; push (@loop_data, \%tag_data); *************** *** 325,329 **** type => "intranet", authnotrequired => 0, ! flagsrequired => {catalogue => 1}, debug => 1, }); --- 326,330 ---- type => "intranet", authnotrequired => 0, ! flagsrequired => {editcatalogue => 1}, debug => 1, }); Index: additem.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui.simple/additem.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** additem.pl 12 Jan 2004 17:00:09 -0000 1.21 --- additem.pl 11 Feb 2004 08:40:11 -0000 1.22 *************** *** 275,277 **** $template->param($error => 1); } ! output_html_with_http_headers $input, $cookie, $template->output; \ No newline at end of file --- 275,277 ---- $template->param($error => 1); } ! output_html_with_http_headers $input, $cookie, $template->output; From tipaul at users.sourceforge.net Wed Feb 11 09:40:12 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:12 -0800 Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.78,1.79 BookShelves.pm,1.11,1.12 Catalogue.pm,1.37,1.38 Members.pm,1.2,1.3 Output.pm,1.46,1.47 Search.pm,1.85,1.86 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/C4 Modified Files: Biblio.pm BookShelves.pm Catalogue.pm Members.pm Output.pm Search.pm Log Message: synch'ing 2.0.0 branch and head Index: Biblio.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -r1.78 -r1.79 *** Biblio.pm 9 Dec 2003 15:57:28 -0000 1.78 --- Biblio.pm 11 Feb 2004 08:40:09 -0000 1.79 *************** *** 567,571 **** return; } - # otherwise, skip through each subfield... my @fields = $record->fields(); --- 567,570 ---- *************** *** 695,699 **** $dbh->do("delete from marc_subfield_table where bibid='$bibid' and tag='$tag' and tagorder='$tagorder' ! and subfieldcode='$subfield' and subfieldorder='$subfieldorder "); } --- 694,698 ---- $dbh->do("delete from marc_subfield_table where bibid='$bibid' and tag='$tag' and tagorder='$tagorder' ! and subfieldcode='$subfield' and subfieldorder='$subfieldorder' "); } *************** *** 1435,1439 **** price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, --- 1434,1438 ---- price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! bulk =?, notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, *************** *** 1442,1446 **** $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'notforloan'}); } else { $sth=$dbh->prepare("Insert into items set --- 1441,1445 ---- $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); } else { $sth=$dbh->prepare("Insert into items set *************** *** 1451,1455 **** price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, --- 1450,1454 ---- price = ?, replacementprice = ?, replacementpricedate = NOW(), itemnotes = ?, ! bulk = ? , notforloan = ? "); $sth->execute($itemnumber, $item->{'biblionumber'}, *************** *** 1458,1462 **** $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'notforloan'}); } if (defined $sth->errstr) { --- 1457,1461 ---- $item->{'homebranch'},$item->{'holdingbranch'}, $item->{'price'},$item->{'replacementprice'}, ! $item->{'itemnotes'},$item->{'bulk'},$item->{'notforloan'}); } if (defined $sth->errstr) { *************** *** 1472,1477 **** # my $dbh=C4Connect; $item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'}; ! my $query="update items set barcode=?,itemnotes=? where itemnumber=?"; ! my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'itemnum'}); if ($item->{'barcode'} eq ''){ $item->{'notforloan'}=0 unless $item->{'notforloan'}; --- 1471,1476 ---- # my $dbh=C4Connect; $item->{'itemnum'}=$item->{'itemnumber'} unless $item->{'itemnum'}; ! my $query="update items set barcode=?,itemnotes=?,bulk=?,notforloan=? where itemnumber=?"; ! my @bind = ($item->{'barcode'},$item->{'notes'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); if ($item->{'barcode'} eq ''){ $item->{'notforloan'}=0 unless $item->{'notforloan'}; *************** *** 1485,1491 **** homebranch=?, itemlost=?, ! wthdrawn=? where itemnumber=?"; ! @bind = ($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'itemnum'}); } if ($item->{'replacement'} ne ''){ --- 1484,1492 ---- homebranch=?, itemlost=?, ! wthdrawn=?, ! bulk=?, ! notforloan=?, where itemnumber=?"; ! @bind = ($item->{'bibitemnum'},$item->{'barcode'},$item->{'notes'},$item->{'homebranch'},$item->{'lost'},$item->{'wthdrawn'},$item->{'bulk'},$item->{'notforloan'},$item->{'itemnum'}); } if ($item->{'replacement'} ne ''){ *************** *** 1557,1561 **** } $query =~ s/\,$//; - warn "Q 1560 : $query"; my $sth2=$dbh->prepare($query); $sth2->execute(@bind); --- 1558,1561 ---- *************** *** 1582,1586 **** #replacing the last , by ",?)" $query=~ s/\,$//; - warn "Q olddelbiblio : $query"; $sth=$dbh->prepare($query); $sth->execute(@bind); --- 1582,1585 ---- *************** *** 2193,2196 **** --- 2192,2208 ---- # $Id$ # $Log$ + # Revision 1.79 2004/02/11 08:40:09 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.78.2.3 2004/02/10 13:15:46 tipaul + # removing 2 warnings + # + # Revision 1.78.2.2 2004/01/26 10:38:06 tipaul + # dealing correctly "bulk" field + # + # Revision 1.78.2.1 2004/01/13 17:29:53 tipaul + # * minor html fixes + # * adding publisher in acquisition process (& ordering basket by publisher) + # # Revision 1.78 2003/12/09 15:57:28 tipaul # rolling back to working char_decode sub Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** BookShelves.pm 15 Dec 2003 10:57:08 -0000 1.11 --- BookShelves.pm 11 Feb 2004 08:40:09 -0000 1.12 *************** *** 145,163 **** #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! my $sth=$dbh->prepare("select * from shelfcontents ! where shelfnumber=? and itemnumber=?"); ! ! $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents ! (shelfnumber, itemnumber, flags) values (?, ?, 0)"); - # FIXME - The default for 'flags' is NULL. - # Why set it to 0? $sth->execute($shelfnumber, $itemnumber); ! } } --- 145,159 ---- #' sub AddToShelf { ! my ($env, $itemnumber, $shelfnumber) = @_; ! return unless $itemnumber; ! my $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); $sth->execute($shelfnumber, $itemnumber); ! if ($sth->rows) { ! # already on shelf ! } else { ! $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); ! $sth->execute($shelfnumber, $itemnumber); ! } } *************** *** 244,247 **** --- 240,249 ---- # # $Log$ + # Revision 1.12 2004/02/11 08:40:09 tipaul + # synch'ing 2.0.0 branch and head + # + # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul + # fixing bugs in bookshelves management. + # # Revision 1.11 2003/12/15 10:57:08 slef # DBI call fix for bug 662 Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** Catalogue.pm 17 Dec 2003 01:28:31 -0000 1.37 --- Catalogue.pm 11 Feb 2004 08:40:10 -0000 1.38 *************** *** 112,116 **** $sth->execute($basketno); } ! my @results = (); while (my $data=$sth->fetchrow_hashref){ push(@results,$data); --- 112,121 ---- $sth->execute($basketno); } ! $query.=" order by biblioitems.publishercode"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my @results; ! # print $query; ! my $i=0; while (my $data=$sth->fetchrow_hashref){ push(@results,$data); Index: Members.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Members.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Members.pm 15 Dec 2003 16:19:14 -0000 1.2 --- Members.pm 11 Feb 2004 08:40:10 -0000 1.3 *************** *** 67,73 **** my $autonumber_members = C4::Context->boolean_preference('autoMemberNum'); $autonumber_members = 0 unless defined $autonumber_members; - - warn "autoMemberNum is $autonumber_members\n"; - # Find out whether member numbers should be generated # automatically. Should be either "1" or something else. --- 67,70 ---- Index: Output.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Output.pm,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -r1.46 -r1.47 *** Output.pm 10 Feb 2004 00:43:21 -0000 1.46 --- Output.pm 11 Feb 2004 08:40:10 -0000 1.47 *************** *** 76,80 **** #FIXME: this is a quick fix to stop rc1 installing broken #Still trying to figure out the correct fix. ! my $path = C4::Context->config('intrahtdocs')."/intranet-tmpl/default/en/includes/"; #--------------------------------------------------------------------------------------------------------- --- 76,80 ---- #FIXME: this is a quick fix to stop rc1 installing broken #Still trying to figure out the correct fix. ! my $path = C4::Context->config('intrahtdocs')."/default/en/includes/"; #--------------------------------------------------------------------------------------------------------- Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -r1.85 -r1.86 *** Search.pm 14 Dec 2003 17:25:37 -0000 1.85 --- Search.pm 11 Feb 2004 08:40:10 -0000 1.86 *************** *** 1146,1150 **** } else { if ($type eq 'subject'){ ! $query .= "group by subject order by subject "; } } --- 1146,1150 ---- } else { if ($type eq 'subject'){ ! $query .= "order by subject group by subject "; } } *************** *** 1350,1358 **** } ! my $class = $data->{'classification'}; my $dewey = $data->{'dewey'}; $dewey =~ s/0+$//; ! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general ! # books about computer science if ($dewey < 10){$dewey='00'.$dewey;} if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;} --- 1350,1357 ---- } ! my $class = $data->{'classification'};# FIXME : $class is useless my $dewey = $data->{'dewey'}; $dewey =~ s/0+$//; ! if ($dewey eq "000.") { $dewey = "";}; # FIXME - "000" is general books about computer science if ($dewey < 10){$dewey='00'.$dewey;} if ($dewey < 100 && $dewey > 10){$dewey='0'.$dewey;} *************** *** 1378,1382 **** $sth->finish; #FIXME: ordering/indentation here looks wrong ! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=>"); $sth2->execute($biblionumber); my $data; --- 1377,1381 ---- $sth->finish; #FIXME: ordering/indentation here looks wrong ! my $sth2=$dbh->prepare("Select * from aqorders where biblionumber=?"); $sth2->execute($biblionumber); my $data; *************** *** 1949,1953 **** } #print $query; ! my $sth=$dbh->prepare(""); $sth->execute($bornum); my @result; --- 1948,1952 ---- } #print $query; ! my $sth=$dbh->prepare($query); $sth->execute($bornum); my @result; From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/admin branches.pl,1.24,1.25 itemtypes.pl,1.11,1.12 koha2marclinks.pl,1.10,1.11 thesaurus.pl,1.10,1.11 Message-ID: Update of /cvsroot/koha/koha/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/admin Modified Files: branches.pl itemtypes.pl koha2marclinks.pl thesaurus.pl Log Message: synch'ing 2.0.0 branch and head Index: branches.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/branches.pl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** branches.pl 12 Jan 2004 16:55:05 -0000 1.24 --- branches.pl 11 Feb 2004 08:40:10 -0000 1.25 *************** *** 79,83 **** } $template->param(action => $script_name); - if ($op eq 'add') { # If the user has pressed the "add new branch" button. --- 79,82 ---- Index: itemtypes.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** itemtypes.pl 12 Jan 2004 16:55:05 -0000 1.11 --- itemtypes.pl 11 Feb 2004 08:40:10 -0000 1.12 *************** *** 97,101 **** if ($itemtype) { my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge from itemtypes where itemtype=?"); $sth->execute($itemtype); $data=$sth->fetchrow_hashref; --- 97,101 ---- if ($itemtype) { my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("select itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan from itemtypes where itemtype=?"); $sth->execute($itemtype); $data=$sth->fetchrow_hashref; *************** *** 106,110 **** loanlength => $data->{'loanlength'}, renewalsallowed => $data->{'renewalsallowed'}, ! rentalcharge => $data->{'rentalcharge'}); ; # END $OP eq ADD_FORM --- 106,112 ---- loanlength => $data->{'loanlength'}, renewalsallowed => $data->{'renewalsallowed'}, ! rentalcharge => $data->{'rentalcharge'}, ! notforloan => $data->{'notforloan'} ! ); ; # END $OP eq ADD_FORM *************** *** 113,117 **** } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; ! my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge) values ("; $query.= $dbh->quote($input->param('itemtype')).","; $query.= $dbh->quote($input->param('description')).","; --- 115,119 ---- } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; ! my $query = "replace itemtypes (itemtype,description,loanlength,renewalsallowed,rentalcharge,notforloan) values ("; $query.= $dbh->quote($input->param('itemtype')).","; $query.= $dbh->quote($input->param('description')).","; *************** *** 122,126 **** $query.= "1,"; } ! $query.= $dbh->quote($input->param('rentalcharge')).")"; my $sth=$dbh->prepare($query); $sth->execute; --- 124,133 ---- $query.= "1,"; } ! $query.= $dbh->quote($input->param('rentalcharge')).","; ! if ($input->param('notforloan') ne 1) { ! $query.= "0)"; ! } else { ! $query.= "1)"; ! } my $sth=$dbh->prepare($query); $sth->execute; Index: koha2marclinks.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/koha2marclinks.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** koha2marclinks.pl 12 Jan 2004 16:55:05 -0000 1.10 --- koha2marclinks.pl 11 Feb 2004 08:40:11 -0000 1.11 *************** *** 107,112 **** } #XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS ! my $sth2=$dbh->prepare("SHOW COLUMNS from ?"); ! $sth2->execute($tablename); my $toggle="white"; --- 107,112 ---- } #XXX: This might not work. Maybe should use a DBI call instead of SHOW COLUMNS ! my $sth2=$dbh->prepare("SHOW COLUMNS from $tablename"); ! $sth2->execute; my $toggle="white"; Index: thesaurus.pl =================================================================== RCS file: /cvsroot/koha/koha/admin/thesaurus.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** thesaurus.pl 22 Dec 2003 19:16:58 -0000 1.10 --- thesaurus.pl 11 Feb 2004 08:40:11 -0000 1.11 *************** *** 258,265 **** father => $father); if ($offset>0) { ! $template->param(previous => "<< Prev"); } if ($pagesize<$count) { ! $template->param(next => "Next >>"); } } #---- END $OP eq DEFAULT --- 258,265 ---- father => $father); if ($offset>0) { ! $template->param(previous => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$prevpage"); } if ($pagesize<$count) { ! $template->param(next => "$script_name?branch=$branch&search_category=$search_category&searchstring=$searchstring&offset=$nextpage"); } } #---- END $OP eq DEFAULT From tipaul at users.sourceforge.net Wed Feb 11 09:40:13 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:40:13 -0800 Subject: [Koha-cvs] CVS: koha/acqui addorder.pl,1.16,1.17 basket.pl,1.16,1.17 newbiblio.pl,1.15,1.16 order.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23431/acqui Modified Files: addorder.pl basket.pl newbiblio.pl order.pl Log Message: synch'ing 2.0.0 branch and head Index: addorder.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/addorder.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** addorder.pl 4 Sep 2003 17:29:50 -0000 1.16 --- addorder.pl 11 Feb 2004 08:40:11 -0000 1.17 *************** *** 49,53 **** my $title=$input->param('title'); my $author=$input->param('author'); ! my $copyright=$input->param('copyright'); my $isbn=$input->param('ISBN'); my $itemtype=$input->param('format'); --- 49,53 ---- my $title=$input->param('title'); my $author=$input->param('author'); ! my $copyrightdate=$input->param('copyrightdate'); my $isbn=$input->param('ISBN'); my $itemtype=$input->param('format'); *************** *** 72,78 **** my $budget=$input->param('budget'); my $cost=$input->param('cost'); ! my$sub=$input->param('sub'); my $invoice=$input->param('invoice'); ! if ($quantity ne '0'){ #check to see if biblio exists --- 72,78 ---- my $budget=$input->param('budget'); my $cost=$input->param('cost'); ! my $sub=$input->param('sub'); my $invoice=$input->param('invoice'); ! my $publishercode = $input->param('publishercode'); if ($quantity ne '0'){ #check to see if biblio exists *************** *** 81,90 **** $bibnum = &newbiblio({ title => $title?$title:"", author => $author?$author:"", ! copyright => $copyright?$copyright:"", series => $series?$series:"", }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" }); if ($title) { --- 81,91 ---- $bibnum = &newbiblio({ title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyrightdate?$copyrightdate:"", series => $series?$series:"", }); $bibitemnum = &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"", ! publishercode => $publishercode?$publishercode:"", }); if ($title) { *************** *** 98,102 **** $bibitemnum= &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" }); } &modbiblio({ --- 99,110 ---- $bibitemnum= &newbiblioitem({ biblionumber => $bibnum, itemtype => $itemtype?$itemtype:"", ! isbn => $isbn?$isbn:"" , ! publishercode => $publishercode?$publishercode:"", ! }); ! } else { ! &modbibitem({biblioitemnumber => $bibitemnum, ! isbn => $isbn, ! publishercode => $publishercode, ! }); } &modbiblio({ *************** *** 104,109 **** title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyright?$copyright:"", ! series => $series?$series:"" }); } if ($orderexists ne '') { --- 112,118 ---- title => $title?$title:"", author => $author?$author:"", ! copyrightdate => $copyrightdate?$copyrightdate:"", ! series => $series?$series:"" }, ! ); } if ($orderexists ne '') { Index: basket.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/basket.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** basket.pl 17 Sep 2003 13:33:37 -0000 1.16 --- basket.pl 11 Feb 2004 08:40:11 -0000 1.17 *************** *** 78,81 **** --- 78,82 ---- } $line{ordernumber} = $results[$i]->{'ordernumber'}; + $line{publishercode} = $results[$i]->{'publishercode'}; $line{isbn} = $results[$i]->{'isbn'}; $line{booksellerid} = $results[$i]->{'booksellerid'}; Index: newbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** newbiblio.pl 22 Dec 2003 19:16:59 -0000 1.15 --- newbiblio.pl 11 Feb 2004 08:40:11 -0000 1.16 *************** *** 170,174 **** ecost => $data->{'ecost'}, notes => $data->{'notes'}, ! barcode => $data->{'barcode'},); output_html_with_http_headers $input, $cookie, $template->output; --- 170,175 ---- ecost => $data->{'ecost'}, notes => $data->{'notes'}, ! barcode => $data->{'barcode'}, ! publishercode => $data->{'publishercode'}); output_html_with_http_headers $input, $cookie, $template->output; Index: order.pl =================================================================== RCS file: /cvsroot/koha/koha/acqui/order.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** order.pl 8 Jul 2003 16:20:15 -0000 1.9 --- order.pl 11 Feb 2004 08:40:11 -0000 1.10 *************** *** 64,67 **** --- 64,68 ---- $line{id} =$suppliers[$i]->{'id'}; $line{name} = $suppliers[$i]->{'name'}; + $line{active} = $suppliers[$i]->{'active'}; $line{total} = $orders->[0]->{'count(*)'}; $line{authorisedby} = $orders->[0]->{'authorisedby'}; From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/C4 Authorities.pm,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/C4 Modified Files: Authorities.pm Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: Authorities.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Authorities.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Authorities.pm 15 Dec 2003 14:38:59 -0000 1.7 --- Authorities.pm 11 Feb 2004 08:42:02 -0000 1.8 *************** *** 193,199 **** } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " order by category,freelib limit ?,?"; push(@bind,$offset,($pagesize*4)); ! # warn "q : $query"; my $sth=$dbh->prepare($query); $sth->execute(@bind); --- 193,199 ---- } # $query .= " and freelib like \"$searchstring%\"" if ($searchstring); ! $query .= " limit ?,?"; push(@bind,$offset,($pagesize*4)); ! warn "q : $query". at bind; my $sth=$dbh->prepare($query); $sth->execute(@bind); *************** *** 219,223 **** $cnt = $pagesize+1 if ($cnt>$pagesize); $sth->finish(); ! return ($cnt,\@results); } --- 219,223 ---- $cnt = $pagesize+1 if ($cnt>$pagesize); $sth->finish(); ! return ($#results,\@results); } From tipaul at users.sourceforge.net Wed Feb 11 09:42:05 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:05 -0800 Subject: [Koha-cvs] CVS: koha/misc rebuildthesaurus.pl,1.1,1.2 release_notes_191.txt,1.1,1.2 release_notes_192.txt,1.1,1.2 release_notes_193.txt,1.1,1.2 release_notes_200pre1.txt,1.1,1.2 release_notes_200pre2.txt,1.1,1.2 release_notes_200pre3.txt,1.1,1.2 release_notes_200pre4.txt,1.1,1.2 release_notes_200pre5.txt,1.1,1.2 release_notes_200RC1.txt,1.1,1.2 release_notes_200RC2.txt,1.1,1.2 release_notes_200RC3.txt,1.1,1.2 release_notes_200RC4.txt,1.1,1.2 Install.pm,1.71,1.72 Message-ID: Update of /cvsroot/koha/koha/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/misc Modified Files: Install.pm Added Files: rebuildthesaurus.pl release_notes_191.txt release_notes_192.txt release_notes_193.txt release_notes_200pre1.txt release_notes_200pre2.txt release_notes_200pre3.txt release_notes_200pre4.txt release_notes_200pre5.txt release_notes_200RC1.txt release_notes_200RC2.txt release_notes_200RC3.txt release_notes_200RC4.txt Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: Install.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/Install.pm,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** Install.pm 9 Feb 2004 22:36:32 -0000 1.71 --- Install.pm 11 Feb 2004 08:42:01 -0000 1.72 *************** *** 378,382 **** =cut ! sub getkohaversion ($) { return($kohaversion); } --- 378,382 ---- =cut ! sub getkohaversion () { return($kohaversion); } *************** *** 990,993 **** --- 990,994 ---- foreach my $mysql (qw(/usr/local/mysql /opt/mysql + /usr/local /usr )) { *************** *** 1149,1152 **** --- 1150,1154 ---- /etc/apache/conf/httpd.conf /etc/apache/conf/apache.conf + /etc/apache/httpd.conf /etc/apache-ssl/conf/apache.conf /etc/apache-ssl/httpd.conf From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.66,1.67 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/circ Modified Files: circulation.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -r1.66 -r1.67 *** circulation.pl 26 Jan 2004 19:32:36 -0000 1.66 --- circulation.pl 11 Feb 2004 08:42:02 -0000 1.67 *************** *** 410,413 **** --- 410,428 ---- color => $color, ); + if ($flag eq 'GNA'){ + $template->param( + gna => 'true' + ); + } + if ($flag eq 'LOST'){ + $template->param( + lost => 'true' + ); + } + if ($flag eq 'DBARRED'){ + $template->param( + dbarred => 'true' + ); + } if ($flag eq 'CHARGES') { $template->param( From tipaul at users.sourceforge.net Wed Feb 11 09:42:04 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:42:04 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac-css.fr,1.1,1.2 intranet.en,1.1,1.2 intranet.fr,1.1,1.2 opac.fr,1.4,1.5 tmpl_process.pl,1.9,1.10 translator_doc.txt,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23790/misc/translator Modified Files: intranet.en intranet.fr opac.fr tmpl_process.pl translator_doc.txt Added Files: opac-css.fr Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: intranet.en =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.en,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.en 9 Dec 2003 10:26:51 -0000 1.1 --- intranet.en 11 Feb 2004 08:42:01 -0000 1.2 *************** *** 1,7 **** ! 0 ***** ! A ***** ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table. ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically. ***** ! A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm. ***** About ***** Abstract ***** --- 1,4 ---- ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically ***** [...1295 lines suppressed...] Yes ***** yes ***** + YES ***** Yes, See below ***** YesNo ***** You ***** ! You are accessing Koha from a different ip address! Please login again ***** You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from! ***** You did not specify any seach criteria ***** ! You entered an incorrect username or password. Please try again ***** You have error(s) in your MARC configuration. Please fix them before using koha ***** You have the following books waiting to be picked up ***** *************** *** 1110,1114 **** You searched on ***** Young Adult Fiction ***** - Z ***** Z39.50 Search ***** Z39.50 Server ***** --- 1082,1085 ---- Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.fr 9 Dec 2003 10:26:51 -0000 1.1 --- intranet.fr 11 Feb 2004 08:42:02 -0000 1.2 *************** *** 1,874 **** ! 0 ***** ! A ***** ! A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table. ***** ! A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically. ***** ! A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm. ***** ! About ***** ! Abstract ***** ! Account for ***** ! Account Management Fee ***** ! ACCOUNTING DETAILS ***** [...2154 lines suppressed...] ! You are accessing Koha from a different ip address! Please login again Vous avez chang? d'adresse IP. Identifiez-vous ? nouveau ! You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from! Vous pouvez nommer ce fichier d'importation. Cela peut servir lors de la cr?ation de notice biblio pour se souvenir d'o? viennent les donn?es MARC par d?faut. ! You did not specify any seach criteria Vous n'avez pas sp?cifi? de crit?re ! You entered an incorrect username or password. Please try again Identifiant ou mot de passe erron?. Essayez encore ! You have Vous avez ! You have the following books waiting to be picked up Vous avez les livres suivants en attente ! You have the following requests for items on loan Vous avez les demandes suivantes pour des ouvrages en pr?t ! You must create a new group for your item to be added to Vous devez cr?er un nouveau groupe pour ajouter vos ouvrages ! You must give the item a barcode Vous devez attribuer un code barre ? l'ouvrage ! You searched for Votre recherche sur ! You Searched for Votre recherche sur ! You searched on Recherche effectu?e sur ! Young Adult Fiction Fiction Ados ! Z39.50 Search Recherche Z39.50 ! Z39.50 Server Serveur Z39.50 ! Z39.50 Servers Serveurs Z39.50 ! Z39.50 Servers admin Admin Serveurs Z39.50 ! z3950 search Recherche Z39.50 ! Z3950 Search Results R?sultats Recherche Z39.50 ! Zipcode / Town Code postal / Localit? Index: opac.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.fr,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac.fr 9 Dec 2003 10:26:51 -0000 1.4 --- opac.fr 11 Feb 2004 08:42:02 -0000 1.5 *************** *** 5,12 **** Advanced Search, More Options Recherche avanc?e AMOUNT COUT An Error has Occurred Une erreur s'est produite Any Tout Apr Avril - Are any of our records incorrect? Have you moved recently, got a new phone number or e-mail address? Un changement ? nous faire connaitre ? ARE OUR RECORDS CORRECT? Est-ce correct Aug Aout --- 5,12 ---- Advanced Search, More Options Recherche avanc?e AMOUNT COUT + An error has occurred ***** An Error has Occurred Une erreur s'est produite Any Tout Apr Avril ARE OUR RECORDS CORRECT? Est-ce correct Aug Aout *************** *** 15,21 **** BARCODE CODE BARRE Barcode Code barre ! bgcolor='#ffffcc'> ***** Biblio number Notice biblio : - BIBLIO RECORD Notice bibliographique Biblionumber Num?ro notice : Cancelled Annul? --- 15,20 ---- BARCODE CODE BARRE Barcode Code barre ! bgcolor="#ffffcc"> ***** Biblio number Notice biblio : Biblionumber Num?ro notice : Cancelled Annul? *************** *** 45,58 **** Email Mail End reserve on this date Annuler r?servation ? cette date - Exact Exact exact exact Feb Fev Fiction Fiction FINES & CHARGES Dettes Firstname Pr?nom - Free Software ILS SIGB sous licence libre GROUP - GROUPE Group Number Groupe num?ro - Hi Bonjour, Home Accueil Home Branch Annexe propri?taire --- 44,55 ---- Email Mail End reserve on this date Annuler r?servation ? cette date exact exact + Exact Exact Feb Fev Fiction Fiction FINES & CHARGES Dettes Firstname Pr?nom GROUP - GROUPE Group Number Groupe num?ro Home Accueil Home Branch Annexe propri?taire *************** *** 61,73 **** Illus Illus Illustrator Illustrateur ! in dans ! in Maori en langue Maori in the last dans les derniers ISBN ISBN Item Count Nombre d'ouvrages Item lost Ouvrage perdu ! Item Type Type d'ouvrage : ! items currently issued. Ouvrage en pr?t actuellement ! items currently reserved. Ouvrages r?serv?s actuellement Itemtype Type d'ouvrage Jan Jan --- 58,69 ---- Illus Illus Illustrator Illustrateur ! in en in the last dans les derniers ISBN ISBN Item Count Nombre d'ouvrages Item lost Ouvrage perdu ! Item Type Type d'ouvrage ! items currently issued Ouvrage en pr?t actuellement ! items currently reserved Ouvrages r?serv?s actuellement Itemtype Type d'ouvrage Jan Jan *************** *** 79,96 **** Junior Non-Fiction Junior NF Keywords Mot-clefs - Koha Koha KOHA KOHA - Koha : a gift, a contribution Koha : un don, une contribution Koha Login Identifiant Koha - KOHA: Become a Member KOHA : s'inscrire - KOHA: Catalogue Search Recherche catalogue - Koha: Horowhenua Library Trust Catalogue and Member Services Koha, catalogue et outils abonn?s - KOHA: Members Area Zone abonn?s KOHA: OPAC Catalogue Search Recherche OPAC Last borrowed Dernier pr?t Last Borrower 1 Dernier emprunteur 1 Last Borrower 2 Dernier emprunteur 2 - Last Seen Vu Last seen Vu Library Card Carte lecteur Loan Length Dur?e pr?t --- 75,86 ---- Junior Non-Fiction Junior NF Keywords Mot-clefs KOHA KOHA Koha Login Identifiant Koha KOHA: OPAC Catalogue Search Recherche OPAC Last borrowed Dernier pr?t Last Borrower 1 Dernier emprunteur 1 Last Borrower 2 Dernier emprunteur 2 Last seen Vu + Last Seen Vu Library Card Carte lecteur Loan Length Dur?e pr?t *************** *** 100,106 **** Log Out D?connecter Logged in as Connect? en tant que - Logged in as: [ ***** - login Connecter - Logout D?connecter Mar Mars May Mai --- 90,93 ---- *************** *** 108,113 **** modify Modifier Month Mois - Next Records Enregistrement suivant - No Non No. of Items N? ouvrage Non-Fiction NF --- 95,98 ---- *************** *** 131,146 **** Paid for Pay? pour : Password Mot de passe : ! pick up at Prendre ? : Place Placer Place Reserve R?server Please confirm that you wish to request an item of these types Confirmez que vous souhaitez r?server un ouvrage : Please select the branch from which you want to collect the item S?lectionnez l'annexe ou vous prendrez l'ouvrage ! Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you. S?lectionnez les types d'ouvrages souhait?s. Le premier disponible sera gard? pour vous. ! Please, change what's needed. An email will be sent to the library. Changer le n?cessaire ! Previous Records Pr?c?dents Published by Publi? par Publisher Editions Recent acquisitions Acquisitions r?centes ! records. r?ponses Reference Books R?f?rences Renewals Renouvellements --- 116,131 ---- Paid for Pay? pour : Password Mot de passe : ! Pick Up Branch Annexe de retrait Place Placer Place Reserve R?server + Please change what's needed. An email will be sent to the library Changer le n?cessaire Please confirm that you wish to request an item of these types Confirmez que vous souhaitez r?server un ouvrage : Please select the branch from which you want to collect the item S?lectionnez l'annexe ou vous prendrez l'ouvrage ! Please select which item types are ok for you. The first of these item that matches one of these types that becomes available will be set kept for you S?lectionnez les types d'ouvrages souhait?s. Le premier disponible sera gard? pour vous. Published by Publi? par Publisher Editions Recent acquisitions Acquisitions r?centes ! record Enr. ! records r?ponses Reference Books R?f?rences Renewals Renouvellements *************** *** 151,173 **** Reserve on this date R?server ? cette date : Reserve page for item R?servation de l'ouvrage : ! reserves already on this item. R?servations d?j? faites sur cet ouvrage ! reserves. R?servations Results R?sultats ! Results through of records. ***** results found R?ponses trouv?es ! search IGNORE ! Search IGNORE Search the catalogue Chercher dans le catalogue - Search the Catalogue Chercher dans le catalogue Sep Sep Serial P?riodique Size Taille Something new ? quelque chose ? modifier ? ! Sorry, KOHA doesnt think you have permission for this page. D?sol?, je pense que vous n'avez pas les permissions suffisantes. Sorry, there were no results D?sol?, aucun r?sultat ! ! Sorry, you cannot make more than Impossible de faire plus de ! Sorry, you cannot make more than reserves. D?sol?, vous ne pouvez pas faire plus de r?servations ! Sorry, you cannot make reserves because you owe . D?sol?, vous ne pouvez pas faire de r?servation parce que vous devez ! Sorry, your session has timed out, please login again. D?connect?. Identifiez vous ? nouveau. STILL OWING EN ATTENTE Street address Adresse postale --- 136,155 ---- Reserve on this date R?server ? cette date : Reserve page for item R?servation de l'ouvrage : ! reserves already on this item R?servations d?j? faites sur cet ouvrage Results R?sultats ! Results through of records ***** results found R?ponses trouv?es ! Search LIMITED;Chercher ! search LIMITED;recherche Search the catalogue Chercher dans le catalogue Sep Sep Serial P?riodique Size Taille Something new ? quelque chose ? modifier ? ! Sorry, KOHA doesnt think you have permission for this page D?sol?, je pense que vous n'avez pas les permissions suffisantes. Sorry, there were no results D?sol?, aucun r?sultat ! ! Sorry, you cannot make more than reserves D?sol?, vous ne pouvez pas faire plus de r?servations ! Sorry, you cannot make reserves because you owe D?sol?, vous ne pouvez pas faire de r?servation parce que vous devez ! Sorry, your session has timed out, please login again D?connect?. Identifiez vous ? nouveau STILL OWING EN ATTENTE Street address Adresse postale *************** *** 177,181 **** Surname Nom Teacher Reference Ref. prof. ! text/html; charset=iso8859-1 text/html; charset=iso8859-1 There are Il y a through ? --- 159,163 ---- Surname Nom Teacher Reference Ref. prof. ! text/html; charset=iso-8859-1 text/html; charset=iso8859-1 There are Il y a through ? *************** *** 184,189 **** Total Due Total d? Total Number of Items Nombre total d'exemplaires ! Try another Essayez un autre ! Type in the box and press the enter key. Saisissez et validez avec Entr?e Unititle Titre unifi? Update Record Mettre ? jour --- 166,171 ---- Total Due Total d? Total Number of Items Nombre total d'exemplaires ! Try another Essayez une autre ! Type in the box and press the enter key Saisissez et validez avec Entr?e Unititle Titre unifi? Update Record Mettre ? jour *************** *** 196,216 **** Work/Fax phone Tel bureau Year Ann?e - Year : Ann?e : - Yes Oui YesNo OuiNon ! You already have a reserve placed on this item. Vous avez d?j? plac? une r?servation sur cet exemplaire ! You are accessing koha from a different ip address! please login again. Vous avez chang? d'adresse IP. Identifiez vous ? nouveau ! You did not specify any seach criteria Vous n'avez pas sp?cifi? de crit?re ! You entered an incorrect username or password, please try again. Identifiant ou mot de passe erron?. Essayez encore. ! You have Vous avez ! You have items currently issued. Vous avez exemplaires en pr?t ! You have items currently reserved. Vous avez exemplaires r?serv?s You have a credit of Vous avez un cr?dit de ! You have no items on issue. Vous n'avez pas d'exemplaire en pr?t You have outstanding charges and fines of Vous avez des dettes de You have reserved items waiting Vous avez des r?servations en attente You must select a branch for pickup! S?lectionnez une annexe ou retirer l'ouvrage ! You must select at least on item type! Vous devez s?lectionner au moins 1 type d'exemplaire You searched on Recherche effectu?e sur Young Adult Fiction Ado fiction ! Your changes won't appear until the library has validated them. Vos changement n'apparaitront que lorsque la biblioth?que les aura valid? --- 178,195 ---- Work/Fax phone Tel bureau Year Ann?e YesNo OuiNon ! You already have a reserve placed on this item Vous avez d?j? plac? une r?servation sur cet exemplaire ! You are accessing koha from a different ip address! please login again Vous avez chang? d'adresse IP. Identifiez vous ? nouveau ! You did not specify any search criteria Vous n'avez pas sp?cifi? de crit?re ! You entered an incorrect username or password, please try again Identifiant ou mot de passe erron?. Essayez encore. ! You have items currently issued Vous avez exemplaires en pr?t ! You have items currently reserved Vous avez exemplaires r?serv?s You have a credit of Vous avez un cr?dit de ! You have no items on issue Vous n'avez pas d'exemplaire en pr?t You have outstanding charges and fines of Vous avez des dettes de You have reserved items waiting Vous avez des r?servations en attente You must select a branch for pickup! S?lectionnez une annexe ou retirer l'ouvrage ! You must select at least one item type! Vous devez s?lectionner au moins 1 type d'exemplaire You searched on Recherche effectu?e sur Young Adult Fiction Ado fiction ! Your changes won't appear until the library has validated them Vos changement n'apparaitront que lorsque la biblioth?que les aura valid? Index: tmpl_process.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** tmpl_process.pl 10 Feb 2004 09:42:18 -0000 1.9 --- tmpl_process.pl 11 Feb 2004 08:42:02 -0000 1.10 *************** *** 74,78 **** { # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char); # updates the list, adding new entries if any %strhash = &update_strhash(\%strhash, \@in_files, $exclude_regex, $filter); --- 74,78 ---- { # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char,1); # updates the list, adding new entries if any %strhash = &update_strhash(\%strhash, \@in_files, $exclude_regex, $filter); *************** *** 94,98 **** # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char); # creates the new tmpl file using the new translation &install_strhash(\%strhash, \@in_files, $in_dir, $out_dir); --- 94,98 ---- # restores the string list from file ! %strhash = &restore_strhash(\%strhash, $str_file, $split_char,0); # creates the new tmpl file using the new translation &install_strhash(\%strhash, \@in_files, $in_dir, $out_dir); *************** *** 116,121 **** my $tmp_dir; # temporary directory name (used to create destination dir) ! $out_dir =~ s/\/$//; # chops the trailing / if any. # Processes every entry found. foreach my $file (@{$in_files}) --- 116,122 ---- my $tmp_dir; # temporary directory name (used to create destination dir) ! my $starttime = time(); + $out_dir =~ s/\/$//; # chops the trailing / if any. # Processes every entry found. foreach my $file (@{$in_files}) *************** *** 129,132 **** --- 130,134 ---- # generates the name of the output file my $out_file = $file; + my $out_file_tmp = $file.".tmp"; # used to check if file has changed or not. if(!defined $in_dir) *************** *** 159,198 **** exit(1); } ! # opens handle for output ! if( !open($fh_out, "> $out_file") ) { ! warn "Can't write $out_file : $!\n"; close($fh_in); next; } ! ! print "Generating $out_file...\n"; ! while(my $line = <$fh_in>) { ! foreach my $text (sort {length($b) <=> length($a)} keys %{$strhash}) { ! # Test if the key has been translated ! if( %{$strhash}->{$text} != 1 ) { ! # Does the line contains text that needs to be changed ? ! if( $line =~ /$text/ && %{$strhash}->{$text} ne "IGNORE") { # changing text ! my $subst = %{$strhash}->{$text}; ! $line =~ s/(\W)$text(\W)/$1$subst$2/g; } } } - $line =~ s/\/\<\!-- TMPL_$1 --\>/g; - $line =~ s/\<\/TMPL_(.*?)\>/\<\!-- \/TMPL_$1 --\>/g; - # Writing the modified (or not) line to output - printf($fh_out "%s", $line); } ! close($fh_in); close($fh_out); } } --- 161,243 ---- exit(1); } ! # opens handle for output ! if( !open($fh_out, "> $out_file_tmp") ) { ! warn "Can''t write $out_file : $!\n"; close($fh_in); next; } ! my $lines; while(my $line = <$fh_in>) { ! $lines.=$line; ! } ! foreach my $text (sort {length($b) <=> length($a) || uc($b) cmp uc($a) } keys %{$strhash}) ! { ! # Test if the key has been translated ! if( %{$strhash}->{$text} != 1) { ! # Does the file contains text that needs to be changed ? ! # escaping \|()[{}^$*+?. ! my $subst = %{$strhash}->{$text}; ! $text =~ s/\\/\\\\/g; ! $text =~ s/\//\\\//g; ! $text =~ s/\|/\\\|/g; ! $text =~ s/\(/\\\(/g; ! $text =~ s/\)/\\\)/g; ! $text =~ s/\[/\\\[/g; ! $text =~ s/\]/\\\]/g; ! $text =~ s/\{/\\\{/g; ! $text =~ s/\}/\\\}/g; ! $text =~ s/\^/\\\^/g; ! $text =~ s/\$/\\\$/g; ! $text =~ s/\*/\\\*/g; ! $text =~ s/\+/\\\+/g; ! $text =~ s/\?/\\\?/g; ! $text =~ s/\./\\\./g; ! if(%{$strhash}->{$text} ne "IGNORE" ) { ! if (%{$strhash}->{$text} =~ "LIMITED") { # changing text ! $subst =~ s/UNUSED;//; ! $subst =~ s/^LIMITED;//g; ! $lines =~ s/(.*)>$text(\W)/$1>$subst$2/g; ! $lines =~ s/(.*) title="$text/$1 title="$subst/g; ! $lines =~ s/(.*) alt="$text/$1 alt="$subst/g; ! } else { ! # changing text ! $subst =~ s/UNUSED;//; ! $lines =~ s/(\W)$text(\W)/$1$subst$2/g; } } } } ! $lines =~ s/\/\<\!-- TMPL_$1 --\>/g; ! $lines =~ s/\<\/TMPL_(.*?)\>/\<\!-- \/TMPL_$1 --\>/g; ! # Writing the modified (or not) file to output ! printf($fh_out "%s", $lines); close($fh_in); close($fh_out); + # check if fh_out and previous fh_out has changed or not. + my $diff; + if(-f $out_file) { + $diff = `diff $out_file $out_file_tmp`; + } else { + $diff = "write it, it's new"; + } + if ($diff) { + print "WRITING : $out_file\n"; + unlink $out_file; + system("mv $out_file_tmp $out_file"); + } else { + print "no changes in $out_file\n"; + unlink $out_file_tmp; + } } + my $timeneeded = time() - $starttime; + print "done in $timeneeded seconds\n"; + } *************** *** 213,217 **** print "Processing $in...\n"; ! # Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; --- 258,262 ---- print "Processing $in...\n"; ! # 'Creates a filehandle containing all the strings returned by # the plain text program extractor open($fh, "$filter $in |") or print "$filter $in : $!"; *************** *** 222,227 **** { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^\s+//; # remove trailing blanks, ':' or '*' ! $str =~ s/\s*\**:*\s*$//; # the line begins with letter(s) followed by optional words and/or spaces --- 267,272 ---- { $str =~ s/[\n\r\f]+$//; # chomps the trailing \n (or if file was edited with Windows) ! $str =~ s/^[\s+:\(]*//; # remove useless characters ! $str =~ s/[\s\*:\[*\(|\.,\)]*$//; # the line begins with letter(s) followed by optional words and/or spaces *************** *** 235,238 **** --- 280,286 ---- # the line is not already in the list so add it %{$strhash}->{$str}=1; + } else { + # remove UNUSED; + %{$strhash}->{$str} =~ s/^UNUSED;//; } } *************** *** 252,257 **** sub restore_strhash { ! my($strhash, $str_file, $split_char) = @_; ! my $fh; --- 300,305 ---- sub restore_strhash { ! my($strhash, $str_file, $split_char, $detect_unused) = @_; ! my $fh; *************** *** 259,263 **** print "Restoring string list from $str_file...\n"; ! while( my $line = <$fh> ) { --- 307,311 ---- print "Restoring string list from $str_file...\n"; ! while( my $line = <$fh> ) { *************** *** 277,280 **** --- 325,331 ---- %{$strhash}->{$original} = 1; } + if ($detect_unused) { + %{$strhash}->{$original} = "UNUSED;".%{$strhash}->{$original} unless %{$strhash}->{$original}=~ /^UNUSED;/; + } } *************** *** 300,306 **** print "Writing string list to $str_file...\n"; ! foreach my $str(sort {uc($a) cmp uc($b) || length($a) <=> length($b)} keys %{$strhash}) { ! if(%{$strhash}->{$str} != 1) { printf($fh "%s%s%s\n", $str, $split_char, %{$strhash}->{$str}); --- 351,357 ---- print "Writing string list to $str_file...\n"; ! foreach my $str(sort {uc($a) cmp uc($b) || length($b) <=> length($a)} keys %{$strhash}) { ! if(%{$strhash}->{$str}!=1) { printf($fh "%s%s%s\n", $str, $split_char, %{$strhash}->{$str}); *************** *** 308,312 **** else { ! printf($fh "%s%s%s\n", $str, $split_char,"*****") unless ($str >0); } } --- 359,363 ---- else { ! printf($fh "%s%s%s\n", $str, $split_char,"*****") unless ($str >0 || length($str) eq 1); } } *************** *** 457,458 **** --- 508,510 ---- exit(0); } + Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** translator_doc.txt 5 Dec 2003 16:53:46 -0000 1.1 --- translator_doc.txt 11 Feb 2004 08:42:02 -0000 1.2 *************** *** 1,3 **** ! TRANSLATION TOOL : ============ This transation tool should greatly help Koha translators. --- 1,3 ---- ! TRANSLATION TOOL , V2.0: ============ This transation tool should greatly help Koha translators. *************** *** 15,25 **** ============ 1- create your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & french being separated by a tab 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version, go back to pt1 & repeat. WEAKNESSES --- 15,31 ---- ============ 1- create your translation file : ! ./tmpl_process.pl create -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) 3- create your translated version : ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy images/css files in your new directory (as they are NOT moved by tmpl_process.pl install) ! If something changes in english version : ! 1- update your translation file : ! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s opac.fr -r ! 2- translate new your opac.fr file (english & other_language being separated by a tab, using IGNORE and LIMITED pragmas, see below) ! 3- create your translated version : ! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s opac.fr -r ! 4- copy new images/css files in your new directory if needed WEAKNESSES *************** *** 39,44 **** words that are in the templates and in a perl script name are replaced ! For example : Search is replace by Recherche in french, thus,giving , which is wrong... ! The only way I've found to solve this is to ignore any translation whose translation string is IGNORE ! (search is the only cas i've found in french opac) - MISSING STRINGS --- 45,61 ---- words that are in the templates and in a perl script name are replaced ! For example : Search is replace by Recherche in french, thus,giving , which is wrong... ! 2 ways to solve this problem, IGNORE & LIMITED pragma. ! IGNORE : ! if a line in translation file is : ! this_original_string IGNORE ! it is ignored during translation. ! LIMITED : ! if a line in translation file is : ! this_original_string LIMITED;the_translation_string ! The string is translated only if : ! * has a > just before ! * has title=" just before ! * has alt=" just before. ! This prevent stupid replaces, at the cost of some missing translation maybe. - MISSING STRINGS From tipaul at users.sourceforge.net Wed Feb 11 09:46:07 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:46:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-main.tmpl,1.2,1.3 opac-user.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24748/koha-tmpl/opac-tmpl/vanilla/en Modified Files: opac-main.tmpl opac-user.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-main.tmpl 18 Mar 2003 19:52:36 -0000 1.2 --- opac-main.tmpl 11 Feb 2004 08:46:05 -0000 1.3 *************** *** 162,166 ****

    For more information on the koha libary system
    ! vist     www.koha.org

    \ No newline at end of file --- 162,166 ----

    For more information on the koha libary system
    ! visit www.koha.org

    \ No newline at end of file Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac-user.tmpl 18 Mar 2003 19:52:37 -0000 1.2 --- opac-user.tmpl 11 Feb 2004 08:46:05 -0000 1.3 *************** *** 139,144 **** ! Renew Not renewable --- 139,148 ---- ! ! ! Not renewable ! Renew + Not renewable *************** *** 227,231 **** ! Renew --- 231,235 ---- ! Renew From tipaul at users.sourceforge.net Wed Feb 11 09:44:31 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:31 -0800 Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_210c.pl,1.3,1.4 unimarc_field_225a.pl,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/value_builder Modified Files: unimarc_field_210c.pl unimarc_field_225a.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: unimarc_field_210c.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_210c.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** unimarc_field_210c.pl 1 Aug 2003 14:20:51 -0000 1.3 --- unimarc_field_210c.pl 11 Feb 2004 08:44:28 -0000 1.4 *************** *** 78,82 **** $res .= " ]; ! // search isbn subfield. it's 010a var isbn_found; for (i=0 ; iparam("result"); ! print "Content-Type: text/html\n\n"; exit; } --- 115,122 ---- my ($input) = @_; my $index = $input->param("index"); ! my $result = $input->param("result"); ! $result=~s/ / /g; ! $result=~s/"/"/g; ! print "Content-Type: text/html\n\n"; exit; } Index: unimarc_field_225a.pl =================================================================== RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** unimarc_field_225a.pl 23 Jun 2003 11:27:49 -0000 1.5 --- unimarc_field_225a.pl 11 Feb 2004 08:44:29 -0000 1.6 *************** *** 120,124 **** my @collections; if ($isbn_found) { ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS'"); my @splited = split //, $isbn_found; my $isbn_rebuild=''; --- 120,124 ---- my @collections; if ($isbn_found) { ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father=? and category='EDITORS' order by stdlib"); my @splited = split //, $isbn_found; my $isbn_rebuild=''; *************** *** 132,136 **** } else { # if there is no isbn, search with % ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS'"); $sth->execute("\%$authoritysep $editor_found $authoritysep"); while (my ($line)= $sth->fetchrow) { --- 132,136 ---- } else { # if there is no isbn, search with % ! my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib"); $sth->execute("\%$authoritysep $editor_found $authoritysep"); while (my ($line)= $sth->fetchrow) { From tipaul at users.sourceforge.net Wed Feb 11 09:44:30 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:30 -0800 Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.10,1.11 search.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/z3950 Modified Files: processz3950queue search.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: processz3950queue =================================================================== RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** processz3950queue 6 Nov 2003 15:08:40 -0000 1.10 --- processz3950queue 11 Feb 2004 08:44:28 -0000 1.11 *************** *** 11,14 **** --- 11,91 ---- use Net::Z3950; + =head1 NAME + + processz3950queue. The script that does z3950 searches. + + =head1 SYNOPSIS + + This script can be used on a console (as normal user) or by the daemon-launch script. + + Don't forget to EXPORT PERL5LIB=/PATH/to/KOHA before executing it if you use console mode. + + It : + 1- extracts z3950 requests from z3950queue table, + 2- creates entries in z3950results to store the result + 3- launch z3950 queries in asynchronous mode, using Unix fork() + 4- store results in marc_breeding table. + + The z3950 results queries are managed in z3950/search.pl script (poped-up window in MARC editor). + + =head1 DESCRIPTION + + =head2 table z3950servers + + This table stores the differents z3950 servers. + A server is used if checked=1. The rank is NOT used as searches are now asynchronous. + + =head2 table z3950queue + + Table use to manage queries. A single line is created in this table for each z3950 search request. + If more than 1 server is called, the C field containt all of them separated by |. + + z3950 search requests are done by z3950/search.pl script. + At this stage, the fields are created with C and C empty + + Then, the processz3950queue finds this entry and : + 1- store date (time()) in C + 2- set C = -1 + + when the requests are all sent : + 2- set C = 1 + 3- set C (FIXME: always equal to startdate for me) + + entries are deleted when : + - C is more than 1 day ago. + + FIXME: + - results, numrecords fields are unused + + =head2 table z3950results + + 1 entry is created for each request, for each server called. + when created : + * C is filled + * C is null + * active is set to 0. when active is 0, it means the request has not been sent. when set to 1, it means it's on the way. + + When a search is ended, C is set, and C is set to -1 + + =head1 How it's written + + on every loop : + * delete old queries + * for each entry in z3950queue table that is not done=1 { + for each search request { + for each server { + try to connect + look for results + * results can be : + - existing and already running on another process (active=1) + - existing & finished (active=-1) + - non existent => create it and run the request. + } + } + } + =over 2 + + =cut + if ($< == 0) { *************** *** 30,34 **** my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("update z3950results set active=0"); $sth->execute; $sth->finish; --- 107,112 ---- my $dbh = C4::Context->dbh; ! # we begin the script, so "unactive" every pending request : they will never give anything, the script died :-( ! my $sth=$dbh->prepare("update z3950results set active=0 where active<>-1"); $sth->execute; $sth->finish; *************** *** 52,106 **** print "starting loop\n"; $checkqueue = 1; # FIXME during testing, this line forces the loop. REMOVE it to use SIG{HUP} when "daemonized" ! if ($checkqueue) { # everytime a SIG{HUP} is recieved $checkqueue=0; ! my $sth=$dbh->prepare("select id,term,type,servers,identifier from z3950queue order by id"); $sth->execute; while (my ($id, $term, $type, $servers,$random) = $sth->fetchrow) { if ($forkcounter<12) { my $now=time(); my $stk=$dbh->prepare("select id,server,startdate,enddate,numrecords,active from z3950results where queryid=?"); ($stk->execute($id)) || (next); my %serverdone; unless ($stk->rows) { my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=? where id=?"); $sti->execute($now,$id); } while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) { ! if ($r_enddate >0) { $serverdone{$r_server}=1; ! } elsif ($active) { $serverdone{$r_server}=1; ! } else { $serverdone{$r_server}=-1; } } - $stk->finish; ! my $attr=''; ! if ($type eq 'isbn') { ! $attr='1=7'; ! } elsif ($type eq 'title') { ! $attr='1=4'; ! } elsif ($type eq 'author') { ! $attr='1=1003'; ! } elsif ($type eq 'lccn') { ! $attr='1=9'; ! } elsif ($type eq 'keyword') { ! $attr='1=1016'; ! } ! $term='"'.$term.'"'; ! my $query="\@attr $attr $term"; ! my $totalrecords=0; ! my $serverinfo; ! my $stillprocessing=0; ! my $globalname; ! my $globalsyntax; ! my $globalencoding; ! foreach $serverinfo (split(/\|/, $servers)) { ! (next) if ($serverdone{$serverinfo} == 1); ! my $stillprocessing=1; if (my $pid=fork()) { $forkcounter++; } else { my $dbi = C4::Context->dbh; my ($name, $server, $database, $user, $password,$syntax) = split(/\//, $serverinfo, 6); --- 130,183 ---- print "starting loop\n"; $checkqueue = 1; # FIXME during testing, this line forces the loop. REMOVE it to use SIG{HUP} when "daemonized" ! + # clean DB + my $now = time(); + # delete z3950queue entries that are more than 1 day old + my $sth = $dbh->prepare("delete from z3950queue where ?-startdate > 86400"); + $sth->execute($now); + # delete z3950results queries that are more than 1 hour old + $sth = $dbh->prepare("delete from z3950results where ?-startdate > 3600"); + $sth->execute($now); if ($checkqueue) { # everytime a SIG{HUP} is recieved $checkqueue=0; ! # parse every entry in QUEUE ! $sth=$dbh->prepare("select id,term,type,servers,identifier from z3950queue where done<>1 or done is null order by id"); $sth->execute; while (my ($id, $term, $type, $servers,$random) = $sth->fetchrow) { + # FIXME: there is no "else". So, if more than 12 requests at the same time => requests are lost ! if ($forkcounter<12) { my $now=time(); + # search for results entries for this request my $stk=$dbh->prepare("select id,server,startdate,enddate,numrecords,active from z3950results where queryid=?"); ($stk->execute($id)) || (next); my %serverdone; + # if no results => set queue to done = -1, set startdate and begin creating z3950results table entries & z3950 queries unless ($stk->rows) { my $sti=$dbh->prepare("update z3950queue set done=-1,startdate=? where id=?"); $sti->execute($now,$id); } + # check which servers calls have already been created (before a crash) while (my ($r_id, $r_server,$r_startdate,$r_enddate,$r_numrecords,$active) = $stk->fetchrow) { ! if ($r_enddate >0) { # result entry exist & finished $serverdone{$r_server}=1; ! } elsif ($active) { # result entry exists & on the way (active=1) or already done (active=-1) $serverdone{$r_server}=1; ! } else { # otherwise $serverdone{$r_server}=-1; } + # note that is the entry doesn't exist, the $serverdone{$r_server} is 0 (important later !) } $stk->finish; ! foreach my $serverinfo (split(/\|/, $servers)) { ! (next) if ($serverdone{$serverinfo} == 1); #(otherwise, is 0 or -1) ! my $totalrecords=0; ! my $globalname; ! my $globalsyntax; ! my $globalencoding; ! # fork a process for this z3950 query if (my $pid=fork()) { $forkcounter++; } else { + # and connect to z3950 server + #FIXME: why do we need $dbi ? can't we use $dbh ? my $dbi = C4::Context->dbh; my ($name, $server, $database, $user, $password,$syntax) = split(/\//, $serverinfo, 6); *************** *** 110,172 **** my $servername=$1; my $port=$2; ! print "Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n"; ! $now=time(); ! my $q_serverinfo=$dbi->quote($serverinfo); ! my $resultsid; ! if ($serverdone{$serverinfo}==-1) { ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($q_serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! } else { ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($q_serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! unless ($resultsid) { ! $stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)"); ! $stj->execute($q_serverinfo, $id, $now); ! $resultsid=$dbi->{'mysql_insertid'}; ! $stj->finish; ! } } ! my $stj=$dbh->prepare("update z3950results set active=1 where id=?"); ! $stj->execute($resultsid); my $conn; my $noconnection=0; my $error=0; if ($user) { ! eval { $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database, user => $user, password => $password); }; ! if ($@) { ! $noconnection=1; ! } else { ! $error=pe(); ! } } else { ! eval { $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database); }; ! if ($@) { ! $noconnection=1; ! } else { ! $error=pe(); ! } } if ($noconnection || $error) { ! warn "no connection at $globalname "; } else { ! warn "$globalname ==> $globalsyntax"; eval {$conn->option(elementSetName => 'F')}; eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC"); eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC"); if ($@) { ! print "$globalname ERROR: $@\n"; } else { - # print "Q: $query\n"; my $rs=$conn->search($query); pe(); my $numresults=$rs->size(); if ($numresults eq 0) { ! warn "$globalname ==> answered : no records found"; } else { ! warn "$globalname ==> answered : $numresults found"; } pe(); --- 187,267 ---- my $servername=$1; my $port=$2; ! my $attr=''; ! if ($type eq 'isbn') { ! $attr='1=7'; ! } elsif ($type eq 'title') { ! $attr='1=4'; ! } elsif ($type eq 'author') { ! $attr='1=1003'; ! } elsif ($type eq 'lccn') { ! $attr='1=9'; ! } elsif ($type eq 'keyword') { ! $attr='1=1016'; } ! my $query="\@attr $attr \"$term\""; ! print "$$/$id : Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n"; ! # try to connect my $conn; my $noconnection=0; my $error=0; + # the z3950 query is builded. Launch it. if ($user) { ! $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database, user => $user, password => $password) || ($noconnection=1); } else { ! $conn= new Net::Z3950::Connection($servername, $port, databaseName => $database) || ($noconnection=1); } if ($noconnection || $error) { ! # if connection impossible, don't go further ! ! print "$$/$id : no connection at $globalname\n"; ! my $result = MARC::Record->new(); ! my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($result,-1,"$globalname server is NOT responding","",$random); } else { ! # else, build z3950 query and do it ! ! $now=time(); ! my $resultsid=""; ! # create z3950results entries. ! if ($serverdone{$serverinfo}==-1) { # if entry exist, just retrieve it ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! print "$$/$id : 1 >> $resultsid\n"; ! } else { # else create it : (may be serverdone=1 or 0) ! my $stj=$dbi->prepare("select id from z3950results where server=? and queryid=?"); ! $stj->execute($serverinfo,$id); ! ($resultsid) = $stj->fetchrow; ! $stj->finish; ! print "$$/$id : 2 >> $resultsid\n"; ! unless ($resultsid) { ! $stj=$dbi->prepare("insert into z3950results (server, queryid, startdate) values (?,?,?)"); ! $stj->execute($serverinfo, $id, $now); ! $resultsid=$dbi->{'mysql_insertid'}; ! $stj->finish; ! print "$$/$id : creating and "; ! } ! } ! print "$$/$id : working on results entry $resultsid\n"; ! # set active to 1 => this request is on the way. ! my $stj=$dbi->prepare("update z3950results set active=1 where id=?"); ! $stj->execute($resultsid); ! ####### ! print "$$/$id : connected to $globalname\n"; eval {$conn->option(elementSetName => 'F')}; eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC"); eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC"); if ($@) { ! print "$$/$id : $globalname ERROR: $@ for $resultsid\n"; ! # in case pb during connexion, set result to "empty" to avoid everlasting loops ! my $stj=$dbi->prepare("update z3950results set numrecords=?,numdownloaded=?,highestseen=0,results='',enddate=? where id=?"); ! $stj->execute(0,0,$now,$resultsid); } else { my $rs=$conn->search($query); pe(); + # we have an answer for a query => get results & store them in marc_breeding table my $numresults=$rs->size(); if ($numresults eq 0) { ! print "$$/$id : $globalname : no records found\n"; } else { ! print "$$/$id : $globalname : $numresults records found, retrieving them (max 80)\n"; } pe(); *************** *** 198,202 **** if ($elapsed) { my $speed=int($numresults/$elapsed*100)/100; ! print "$globalname SPEED: $speed $server done $numrecords\n"; } my $q_result=$dbi->quote($result); --- 293,297 ---- if ($elapsed) { my $speed=int($numresults/$elapsed*100)/100; ! print "$$/$id : $globalname : $server records retrieved $numrecords SPEED: $speed\n"; } my $q_result=$dbi->quote($result); *************** *** 210,274 **** $stj->execute($numresults,$numrecords,$now,$resultsid); } - my $counter=0; - while ($counter<60 && $numrecords<$numresults) { - $counter++; - my $stj=$dbi->prepare("select highestseen from z3950results where id=?"); - $stj->execute($resultsid); - my ($highestseen) = $stj->fetchrow; - if ($highestseen>($numrecords-30)) { - $counter=0; - print " $server rescanning\n"; - my $scantimerstart=time(); - for ($i=$numrecords+1; $i<=(($numresults<($numrecords+40)) ? ($numresults) : ($numrecords+40)); $i++) { - my $rec=$rs->record($i); - my $marcdata=$rec->rawdata(); - $result.=$marcdata; - } - my $scantimerend=time(); - ($numresults<$numrecords+40) ? ($numrecords=$numresults) : ($numrecords += 40); - my $elapsed=$scantimerend-$scantimerstart; - if ($elapsed) { - my $speed=int($numresults/$elapsed*100)/100; - print " SPEED: $speed $server done $numrecords\n"; - } - - my $q_result=$dbi->quote($result); - ($q_result) || ($q_result='""'); - $now=time(); - my $stj=$dbi->prepare("update z3950results set numdownloaded=?,results=? where id=?"); - $stj->execute($numrecords,$q_result,$resultsid); - } - sleep 5; - } } } ! # FIXME - There's already a $stj in this scope ! my $stj=$dbi->prepare("update z3950results set active=0 where id=?"); ! $stj->execute($resultsid); ! eval {$stj->finish}; ! print " $server done.\n"; exit; - sub pe { - return 0; - my $code=$conn->errcode(); - my $msg=$conn->errmsg(); - my $ai=$conn->addinfo(); - print << "EOF"; - CODE: $code - MSG: $msg - ADDTL: $ai - EOF - return 0; - } } } - unless ($stillprocessing) { - #my $sti=$dbh->prepare("select enddate from z3950queue where id=?"); - #$sti->execute($id); - #my ($enddate) = $sti->fetchrow; - #unless ($enddate) { - } } else { } } $lastrun=time(); --- 305,325 ---- $stj->execute($numresults,$numrecords,$now,$resultsid); } } + $stj=$dbi->prepare("update z3950results set active=-1 where id=?"); + $stj->execute($resultsid); + eval {my $stj->finish}; } ! #OK, the search is done inactivate it.. ! print "$$/$id : $server search done.\n"; exit; } } } else { + # $forkcounter >=12 } + # delete z3950queue entry, as everything is done + my $sti=$dbh->prepare("update z3950queue set done=1,enddate=? where id=?"); + $now=time(); + $sti->execute($now,$id); } $lastrun=time(); *************** *** 289,290 **** --- 340,344 ---- + sub pe { + return 0; + } Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/z3950/search.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** search.pl 23 Jun 2003 11:28:53 -0000 1.2 --- search.pl 11 Feb 2004 08:44:28 -0000 1.3 *************** *** 50,54 **** my $record; my $oldbiblio; - warn "search.pl : $bibid / $title / $author / $isbn"; if ($bibid > 0) { $record = MARCgetbiblio($dbh,$bibid); --- 50,53 ---- *************** *** 57,71 **** my $errmsg; unless ($random) { # if random is a parameter => we're just waiting for the search to end, it's a refresh. - warn "NO RANDOM"; if ($isbn) { - warn "ADD ISBN $isbn"; $random =rand(1000000000); $errmsg = addz3950queue($isbn, "isbn", $random, 'CHECKED'); } elsif ($author) { - warn "ADD AUTHOR $author"; $random =rand(1000000000); $errmsg = addz3950queue($author, "author", $random, 'CHECKED'); } elsif ($title) { - warn "ADD TITLE : $title"; $random =rand(1000000000); $errmsg = addz3950queue($title, "title", $random, 'CHECKED'); --- 56,66 ---- From tipaul at users.sourceforge.net Wed Feb 11 09:44:32 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:32 -0800 Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.71,1.72 Message-ID: Update of /cvsroot/koha/koha/updater In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/updater Modified Files: updatedatabase Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: updatedatabase =================================================================== RCS file: /cvsroot/koha/koha/updater/updatedatabase,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** updatedatabase 18 Dec 2003 17:23:22 -0000 1.71 --- updatedatabase 11 Feb 2004 08:44:29 -0000 1.72 *************** *** 857,860 **** --- 857,875 ---- $dbh->do('create fulltext index category_2 on bibliothesaurus (category,freelib)') unless $exists; + # + # creating index in z3950results if needed + # + $sth = $dbh->prepare("show index from z3950results"); + $sth->execute; + my $exists=0; + while ( my ( $table, $non_unique, $key_name, $Seq_in_index, $Column_name, $Collation, $cardinality, $sub_part, $Packed, $comment ) = $sth->fetchrow ) + { + if ($key_name eq 'query_server') { + $exists=1; + } + } + print "Creating index on z3950results\n" unless $exists; + $dbh->do('create unique index query_server on z3950results (queryid,server)') unless $exists; + # changing z3950daemon field to NULL in marc_breeding $dbh->do("ALTER TABLE `marc_breeding` CHANGE `z3950random` `z3950random` VARCHAR( 40 )"); *************** *** 982,986 **** # $Log$ ! # Revision 1.71 2003/12/18 17:23:22 tipaul # fix for 625 # --- 997,1007 ---- # $Log$ ! # Revision 1.72 2004/02/11 08:44:29 tipaul ! # synch'ing 2.0.0 branch (RC4 tag) and head ! # ! # Revision 1.70.2.2 2004/01/20 09:46:53 tipaul ! # new index in z3950results table ! # ! # Revision 1.70.2.1 2003/12/18 17:22:24 tipaul # fix for 625 # From tipaul at users.sourceforge.net Wed Feb 11 09:44:32 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:44:32 -0800 Subject: [Koha-cvs] CVS: koha/sec writeoff.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/sec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24479/sec Modified Files: writeoff.pl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: writeoff.pl =================================================================== RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** writeoff.pl 13 Oct 2002 10:46:38 -0000 1.6 --- writeoff.pl 11 Feb 2004 08:44:30 -0000 1.7 *************** *** 69,92 **** my $dbh = C4::Context->dbh; my $env; ! my $query="Update accountlines set amountoutstanding=0 where "; if ($accounttype eq 'Res'){ ! $query.="accounttype='Res' and accountno='$accountnum' and borrowernumber='$bornum'"; } else { ! $query.="accounttype='$accounttype' and itemnumber='$itemnum' and borrowernumber='$bornum'"; } - my $sth=$dbh->prepare($query); - # print $query; - $sth->execute; $sth->finish; ! $query="select max(accountno) from accountlines"; ! $sth=$dbh->prepare($query); $sth->execute; my $account=$sth->fetchrow_hashref; $sth->finish; $account->{'max(accountno)'}++; ! $query="insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype) ! values ('$bornum','$account->{'max(accountno)'}','$itemnum',now(),'$amount','Writeoff','W')"; ! $sth=$dbh->prepare($query); ! $sth->execute; $sth->finish; # print $query; --- 69,89 ---- my $dbh = C4::Context->dbh; my $env; ! my $sth; if ($accounttype eq 'Res'){ ! $sth=$dbh->prepare("Update accountlines set amountoutstanding=0 where accounttype='Res' and accountno=? and borrowernumber=?"); ! $sth->execute($accountnum,$bornum); } else { ! $sth=$dbh->prepare("Update accountlines set amountoutstanding=0 where accounttype=? and itemnumber=? and borrowernumber=?"); ! $sth->execute($accounttype,$itemnum,$bornum); } $sth->finish; ! $sth=$dbh->prepare("select max(accountno) from accountlines"); $sth->execute; my $account=$sth->fetchrow_hashref; $sth->finish; $account->{'max(accountno)'}++; ! $sth=$dbh->prepare("insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype) ! values (?,?,?,now(),?,'Writeoff','W')"); ! $sth->execute($bornum,$account->{'max(accountno)'},$itemnum,$amount); $sth->finish; # print $query; From tipaul at users.sourceforge.net Wed Feb 11 09:57:23 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:57:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.14,1.15 opac-main.tmpl,1.14,1.15 opac-searchresults.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26686/koha-tmpl/opac-tmpl/default/en Modified Files: opac-detail.tmpl opac-main.tmpl opac-searchresults.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** opac-detail.tmpl 7 Jan 2004 17:26:13 -0000 1.14 --- opac-detail.tmpl 11 Feb 2004 08:57:16 -0000 1.15 *************** *** 8,17 ****

    ! ! --- 8,17 ----

    !

    !

    ! (record )
    *************** *** 19,38 **** --- 19,41 ---- *************** *** 40,47 ****
    ! ( record )
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL: ">
    ! Total Number of Items:     		! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number of Items:
    ! - --- 43,49 ----
    Item TypeClass Location Date Due
    ! *************** *** 51,57 **** ! ! ! --- 53,58 ---- ! ! *************** *** 70,74 ****
    Item Type Location Date Due
    !


    --- 71,75 ---- !


    Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-main.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** opac-main.tmpl 7 Jan 2004 17:53:35 -0000 1.14 --- opac-main.tmpl 11 Feb 2004 08:57:17 -0000 1.15 *************** *** 3,7 **** ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! ! Type in the box and press the enter key.
    ! ! ! -Advanced Search (More Options)
    ! ! !

    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    ! !
    ! !
    !

    !

    Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** request.tmpl 9 Dec 2003 10:28:58 -0000 1.10 --- request.tmpl 11 Feb 2004 09:01:41 -0000 1.11 *************** *** 2,6 ****
    - /images/place-request.gif" align=right > "> --- 2,5 ---- *************** *** 37,50 **** ! Next Available,
    (or choose from list below) ! ! --- 36,49 ----
    /images/background-mem.gif">Request/images/background-mem.gif">Item Type /images/background-mem.gif">Classification /images/background-mem.gif">Volume ! Next Available, or choose from list below
    ! ! *************** *** 143,150 **** ! Next Available ! This type only : --- 142,149 ---- ! Next Available ! This type only : *************** *** 156,161 ****
    /images/background-mem.gif">Request/images/background-mem.gif">Item type /images/background-mem.gif">Classification /images/background-mem.gif">Volume
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png">
    --- 155,161 ---- ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> ! Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** shelves.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- shelves.tmpl 11 Feb 2004 09:01:41 -0000 1.3 *************** *** 1,41 **** -

    Logged in as: [Log Out]

    - - !
    ! ! Shelf List

    ! ! - - - !
    ! ! !
    Add a book by barcode:
    !
    ! ! !
    "> ! Contents of shelf !
    !
    ">">" width=10 align=center> ">" width=10 align=center> ">" width=10 align=center> ">
    !
    ! "> ! ! "> ! !

    --- 1,47 ---- !
    !
    ! ! ! ! !
    "> ! Contents of !
    ">"> "> "> ">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Add a book by barcode in : ! ! ! ! "> ! !
    !
    *************** *** 49,102 ****
    - Modify Shelf Contents

    Bookshelves

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Add Shelf:

    !

    ! !

    ! !
    "> ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    Add or Remove Book Shelves - ! ! \ No newline at end of file --- 55,139 ----

    Bookshelves

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( books) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Add Shelf !
    !

    !
    !

    !
    !
    ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> "> ( books) !
    !

    ! Add or Remove Book Shelves !

    ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** thesaurus_popup.tmpl 9 Dec 2003 10:28:58 -0000 1.4 --- thesaurus_popup.tmpl 11 Feb 2004 09:01:41 -0000 1.5 *************** *** 10,13 **** --- 10,14 ---- "> "> + "> "> *************** *** 19,22 **** --- 20,24 ---- "> + "> "> *************** *** 28,31 **** --- 30,34 ---- "> "> + "> insert a new authority : From tipaul at users.sourceforge.net Wed Feb 11 10:03:48 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** circulation.tmpl 9 Dec 2003 10:29:05 -0000 1.15 --- circulation.tmpl 11 Feb 2004 09:03:46 -0000 1.16 *************** *** 5,9 **** ! &branch=&printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &printer=&print=yes"> Next Borrower  *************** *** 14,24 **** !

    Circulation: Issues


    ! Branch:
    ! Printer:
    !     Change Settings "> "> -

     

    --- 14,21 ----
    !

    Circulation: Issues

    ! Branch: Printer: Change Settings "> "> *************** *** 38,42 **** Branch:
    Printer:
    ! Change Settings"> "> --- 35,39 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 141,145 ****
    ! --- 138,142 ----
    ! *************** *** 172,176 **** + + +
    ! --- 17,39 ----
    --- 169,173 ---- ! ! --- 184,188 ---- ! *************** *** 225,230 **** + *************** *** 257,263 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** moredetail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- moredetail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 *************** *** 31,38 **** Biblionumber:
    ! Item Type:
    URL:
    ! Loan Length:
    ! Rental Charge:
    Classification:
    ISBN:
    --- 31,38 ---- Biblionumber:
    ! Item type:
    URL:
    ! Loan length:
    ! Rental charge:
    Classification:
    ISBN:
    Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** searchresults.tmpl 9 Dec 2003 10:29:06 -0000 1.7 --- searchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.8 *************** *** 85,89 ****
    ! Results through of records.
    --- 85,89 ----
    ! Results through of records.
    Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** subject.tmpl 9 Dec 2003 10:29:06 -0000 1.4 --- subject.tmpl 11 Feb 2004 09:03:46 -0000 1.5 *************** *** 1,6 **** ! ! --- 1,6 ---- ! ! *************** *** 8,30 ****
    *************** *** 187,191 **** Item Barcode:
    Item Barcode:
    ! !
    Patron information
    " onClick="openWindow(this,'Member', 480, 640)"> --- 222,227 ---- ! ! + + + + + + + + + *************** *** 254,258 **** ! --- 260,264 ---- ! *************** *** 264,270 ****
    Borrower information
    " onClick="openWindow(this,'Member', 480, 640)"> *************** *** 233,236 **** --- 230,242 ----
    GNA>Borrower is gone with no address
    LOST>Borrower's card is lost
    DBARRED>Borrower is debarred
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    ODUESYes, See below
    ODUESYes, See below
    !



    !
    /images/background-mem.gif"> --- 270,276 ----
    !
    ! ! --- 24,31 ---- ! *************** *** 64,68 **** --- 91,101 ---- Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cmsdsearchresults.tmpl 9 Dec 2003 10:29:05 -0000 1.2 --- cmsdsearchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.3 *************** *** 24,28 ****
    /images/background-mem.gif"> From tipaul at users.sourceforge.net Wed Feb 11 10:03:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detailprint.tmpl,1.1,1.2 catalogue-home.tmpl,1.8,1.9 cmsdsearchresults.tmpl,1.2,1.3 detail-opac.tmpl,1.5,1.6 detail.tmpl,1.9,1.10 MARCdetail.tmpl,1.14,1.15 moredetail.tmpl,1.9,1.10 searchresults.tmpl,1.7,1.8 subject.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Added Files: detailprint.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** catalogue-home.tmpl 9 Dec 2003 10:29:05 -0000 1.8 --- catalogue-home.tmpl 11 Feb 2004 09:03:46 -0000 1.9 *************** *** 24,31 ****
    HELP
    ! Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

    HELP
    ! Search :Using more fields for your search will slow it down.

    		 --- 64,68 ---- *************** *** 91,101 **** ! //images/2rightarrow.png" BORDER=0 > ! ! Virtual Bookshelves
    ! ! ! Virtual Bookshelves

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** detail-opac.tmpl 9 Dec 2003 10:29:06 -0000 1.5 --- detail-opac.tmpl 11 Feb 2004 09:03:46 -0000 1.6 *************** *** 38,46 **** ! ! --- 38,46 ----
    Item Type Class Location Date DueLast Seen
    ! ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** detail.tmpl 9 Dec 2003 10:29:06 -0000 1.9 --- detail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 *************** *** 25,45 ****
    " class="button">MARC

    ! Subtitle: ! Author: >
    ! Additional Author:
    ! Published by : ! in , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL:
    ! total number of Items: !

    --- 25,47 ----
    " class="button">MARC

    ! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    ! Published by : ! in , ! ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number of Items:     *************** *** 58,67 ****

    Item type Class Location Date DueLast seen
    ! ! ! ! ! ! --- 60,68 ----
    Item TypeClassLocationDate DueLast SeenBarcode Volume
    ! ! ! ! ! *************** *** 69,77 **** ! ! ! --- 70,77 ---- ! ! *************** *** 96,115 ****
    Item typeLocationDate DueLast seenBarcode Volume
    > &item=&bib=&bi=">
    &item=&bib=&bi=">

    - - - - -
    -

    HELP
    - Update Biblio for all Items: Click on the Modify - button [left] to amend the biblio. Any changes you make will update - the record for all the items listed above.

    - Updating the Biblio for only ONE or SOME Items: - If some of the items listed above need a different biblio, or are on the - wrong biblio, you must use the - acquisitions - process to fix this. You will need to "re-order" the items, and delete them - from this biblio.

    -


    --- 96,99 ---- Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** MARCdetail.tmpl 9 Dec 2003 10:29:06 -0000 1.14 --- MARCdetail.tmpl 11 Feb 2004 09:03:46 -0000 1.15 *************** *** 19,22 **** --- 19,23 ----

    		//images/edittrash.png"> ">Normal')">Print MARC biblio :
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Subject
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !
    !

    ! Results through of records.
    --- 8,46 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subject
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! Results through of records.
    From tipaul at users.sourceforge.net Wed Feb 11 10:03:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:03:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple addbiblio.tmpl,1.24,1.25 addbooks.tmpl,1.12,1.13 additem.tmpl,1.14,1.15 isbnsearch.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28336/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: addbiblio.tmpl addbooks.tmpl additem.tmpl isbnsearch.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** addbiblio.tmpl 9 Dec 2003 10:29:06 -0000 1.24 --- addbiblio.tmpl 11 Feb 2004 09:03:47 -0000 1.25 *************** *** 1,3 **** ! "> ! ! z3950 search
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 60,63 **** --- 64,78 ---- + + + + +
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 "> ! ! ! ! ! ! z3950 search
    +   + + +
    >>>>
    +     +
    *************** *** 85,88 **** --- 100,115 ---- +
    + +
    <<<<
    +     +     		+ +
    >>>>
    +     +
    *************** *** 110,113 **** --- 137,152 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 135,138 **** --- 174,189 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 160,163 **** --- 211,226 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 185,188 **** --- 248,263 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 210,213 **** --- 285,300 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 235,238 **** --- 322,337 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 260,263 **** --- 359,374 ---- + + + +
    <<<<
    +     + + + +
    >>>>
    +     + + *************** *** 285,288 **** --- 396,404 ---- + + +
    <<<<
    +     + *************** *** 328,332 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; --- 444,448 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; *************** *** 396,400 **** function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } --- 512,516 ---- function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** addbooks.tmpl 9 Dec 2003 10:29:06 -0000 1.12 --- addbooks.tmpl 11 Feb 2004 09:03:47 -0000 1.13 *************** *** 22,26 **** ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    --- 22,26 ---- ISBN: ! If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.
    If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.
    *************** *** 32,38 ****   ! Create Empty biblio ! Create Empty biblio --- 32,38 ----   ! Create Empty biblio ! Create Empty biblio *************** *** 52,56 **** Keyword: ! --- 52,56 ---- Keyword: ! Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** additem.tmpl 18 Dec 2003 17:19:56 -0000 1.14 --- additem.tmpl 11 Feb 2004 09:03:47 -0000 1.15 *************** *** 1,3 **** ! ! ! ! ! !
    ! ! !
    ! ! ! ! ! ! ! !
    ! ! Koha
    ! SIGB sous licence libre

     ! Koha : un don, une contribution
    en langue Maori         		!         ! Chercher dans le catalogue ! ! !
    ! Saisissez et validez avec Entr?e
    ! - Recherche avanc?e --- 1,91 ---- ! ! ! ! Bienvenue dans l'OPAC de Koha + + ! ! !
    /images/front-background-med.gif"> ! /images/holder.gif" alt="" width="1" height="440" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! --- 93,124 ---- ! ! ! *************** *** 105,107 ****
    /images/holder.gif" alt="" width="260" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="30" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="350" height="88" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" alt="" width="1" height="30" hspace="0" vspace="0" border="0"> ! !        /images/front-arrow.gif" alt="" border="0" width="27" height="22"> ! Chercher dans le catalogue ! ! !
    ! Saisissez et validez avec Entr?e.
    ! /images/front-arrow-small.gif" alt="-" width="20" height="16" hspace="0" vspace="0" border="0" align="middle"> Recherche avanc?e *************** *** 71,102 ****
      !         ! Acquisitions r?centes !
    ! acquis
    ! dans les derniers jours !
      ! ! !

    Connect? en tant que: [Accueil lecteur][D?connecter]

    ! !

    S'identifier

    !
      !        /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! Acquisitions r?centes !
    ! acquis
    ! dans les derniers jours     !
      ! /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! !

    Connect? en tant que: [Accueil lecteur][D?connecter]

    ! !

    S'identifier

    !
    ! --- 127,130 ----
    ! ! Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** opac-moredetail.tmpl 8 Dec 2003 16:27:45 -0000 1.4 --- opac-moredetail.tmpl 11 Feb 2004 08:46:27 -0000 1.5 *************** *** 1,28 **** !
    - -

    Connect? en tant que: [Accueil lecteur][D?connecter]

    - -

    S'identifier ? Koha

    -     -
    ! ! &type=intra> ! ()

    ! > ! > --- 1,22 ---- !

    ! ! &type=intra> ! ()

    ! > ! >

    GROUPE
    *************** *** 34,53 ****
    ! Num?ro notice ::
    ! Type d'ouvrage ::
    ! URL:
    ! Dur?e pr?t:
    ! Co?t du pr?t:
    ! Classification:
    ! ISBN:
    ! Editions:
    ! Placer:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Taille:
    ! Notes:
    ! N? ouvrage:     --- 28,47 ----
    ! Num?ro notice ::
    ! Type d'ouvrage:
    ! URL:
    ! Dur?e pr?t:
    ! Co?t du pr?t:
    ! Classification:
    ! ISBN:
    ! Editions:
    ! Placer:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Taille:
    ! Notes:
    ! N? ouvrage:     *************** *** 55,72 ****
    GROUPE
    !     !
    CODE BARRE !
    ! > ! > ! > --- 49,66 ----
    ! !
    CODE BARRE !
    ! > ! > ! > *************** *** 75,99 ****
    ! Annexe propri?taire:
    ! Vu:
    ! Dernier pr?t:
    ! on issue bit ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Co?t de remplacement:
    ! Ouvrage perdu:
    ! Pay? pour ::
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Annul?:
    &bi=&itm=>Total ! Issues:
    ! Groupe num?ro:
    ! Notice biblio ::
    --- 69,93 ----
    ! Annexe propri?taire:
    ! Vu:
    ! Dernier pr?t:
    ! En pr?t \? ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Co?t de remplacement:
    ! Ouvrage perdu:
    ! Pay? pour ::
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Annul\?:
    &bi=&itm=>Total ! Issues:
    ! Groupe num?ro:
    ! Notice biblio ::
    *************** *** 104,108 ****
    !

    --- 98,102 ----

    !

    *************** *** 110,112 **** ! --- 104,106 ---- ! Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-reserve.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** opac-reserve.tmpl 8 Dec 2003 16:27:45 -0000 1.6 --- opac-reserve.tmpl 11 Feb 2004 08:46:27 -0000 1.7 *************** *** 1,65 **** ! !

    ! !

    Connect? en tant que: [Accueil lecteur][D?connecter]

    ! !

    S'identifier ? Koha

    !     ! ! ! !
    ! Sorry, you cannot make reserves because you owe .
    ! Impossible de faire plus de R?servations
    ! Vous avez d?j? plac? une r?servation sur cet exemplaire
    ! Vous devez s?lectionner au moins 1 type d'exemplaire
    ! S?lectionnez une annexe ou retirer l'ouvrage
    !

    !     ! !

    R?servation de l'ouvrage :: ( )

    !

    Il y a R?servations d?j? faites sur cet ouvrage

    !

    S?lectionnez les types d'ouvrages souhait?s. Le premier disponible sera gard? pour vous.

    !

    ! "> ! ! ! ! ! ! ! ! ! ! !
    ReserverType d'ouvrage : Copies
    Non r?servable

    S?lectionnez l'annexe ou vous prendrez l'ouvrage: !
    !

    ! --- 1,62 ---- ! !
    ! !
    R?server ? cette date :: ! ! !
    !
    ! D?sol?, vous ne pouvez pas faire de r?servation parce que vous devez .
    ! Sorry, you cannot make more than reserves.
    ! Vous avez d?j? plac? une r?servation sur cet exemplaire.
    ! Vous devez s?lectionner au moins 1 type d'exemplaire
    ! S?lectionnez une annexe ou retirer l'ouvrage
    !
    ! ! !

    R?servation de l'ouvrage :: ( )

    !

    Il y a R?servations d?j? faites sur cet ouvrage.

    !

    S?lectionnez les types d'ouvrages souhait?s. Le premier disponible sera gard? pour vous..

    ! ! "> ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! !
    ReserverType d'ouvrage Copies
    "> Non r?servable

    S?lectionnez l'annexe ou vous prendrez l'ouvrage: ! !

    ! *************** *** 67,112 ****
    R?server ? cette date :: ! ! !
    Annuler r?servation ? cette date: ! ! !
    !

    ! !

    !     ! !

    Confirmez que vous souhaitez r?server un ouvrage ::

    !

    ! ! ! ! ! ! ! ! !
    Type d'ouvrage :
    ! Qui sera retir? ? .
    ! ! !
    Il y aura des frais de r?servation de $
    !     ! !
    !     --- 64,113 ----
    		Annuler r?servation ? cette date: ! ! !
    !

    ! ! ! !

    Confirmez que vous souhaitez r?server un ouvrage ::

    !
    ! ! "> ! "> ! ! ! ! !
    /images/background-opac.gif">Type d'ouvrage
    ">
    ! Qui sera retir? ? .
    ! "> ! !

    Il y aura des frais de r?servation de $

    ! ! !
    ! ! ! + \ No newline at end of file Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-searchresults.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-searchresults.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-searchresults.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,66 **** ! -
    - -

    Connect? en tant que: [Accueil lecteur][D?connecter]

    - -

    S'identifier ? Koha

    -     - - - - Recherche effectu?e sur - - - acquis dans les derniers jours
    - - Vous n'avez pas sp?cifi? de crit?re
    -     -     ! R?ponses trouv?es !

    - - - &=>/images/numbers/prev.gif border=0> - - /images/numbers/placeholder.gif border=0> - - - - /images/numbers/-highlight.gif> - - &=>/images/numbers/.gif border=0> - - - - &=>/images/numbers/next.gif border=0> - - /images/numbers/placeholder.gif border=0> - !

    ! ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif> ! --- 1,58 ---- ! !
    ! Recherche effectu?e sur ! ! ! acquis dans les derniers jours
    ! ! Vous n'avez pas sp?cifi? de crit?re
    ! ! + R?ponses trouv?es
    +
    !
    ! ! &=">/images/numbers/prev.gif" border="0" alt="Previous Page" height="14" width="15"> ! ! /images/numbers/placeholder.gif" height="14" width="15" alt="" border="0"> ! ! ! ! /images/numbers/-highlight.gif" alt="" height="14" width="15" border="0"> ! ! &=">/images/numbers/.gif" border="0" alt="" height="14" width="15"> ! ! ! ! &=">/images/numbers/next.gif" border="0" height="14" width="15" alt="Next Page"> ! ! /images/numbers/placeholder.gif" border="0" width="14" height="14" alt=""> !
    !
    ! ! !
    Sujet
    >
     
    ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif"> ! *************** *** 69,79 **** ! !
    Sujet
    ">
     
    ! /images/background-opac.gif> ! ! --- 61,71 ---- ! !
    TitreAuteur © Nombre d'ouvrages
    ! /images/background-opac.gif"> ! ! *************** *** 84,122 **** ! ! ! ! ! ! ! ! ! /images/background-opac.gif> ! ! ! ! ! ! ! ! ! ! ! ! ! --- 15,38 ---- ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 42,47 ****
    !

     

    ! --- 40,47 ----
    !

     

    ! ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** charges.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- charges.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,33 **** ! ! ! ! !

    Chaque champ doit être rempli avec le montant de l'amende, le délai ! et le cycle
    ! (par ex. 1,7,7 = € 1.- d'amende, après 7 jours, tous les 7 jours). !

    ! !

    TitreAuteur © Nombre d'ouvrages
    bgcolor='#ffffcc'>>bgcolor='#ffffcc'>>bgcolor='#ffffcc' align=center> bgcolor='#ffffcc' align=center> bgcolor='#ffffcc'> bgcolor='#ffffcc'> ! ! >Reserver ! Non r?servable !
    ! ! /images/background-opac.gif> ! ! --- 76,114 ---- ! ! ! ! ! ! ! ! ! /images/background-opac.gif"> !
    ! ! &=>Pr?c?dents !   ! ! ! &=>Enregistrement suivant !   !
    bgcolor="#ffffcc">">bgcolor="#ffffcc">">bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> ! ! ">Reserver ! Non r?servable !
    ! ! /images/background-opac.gif"> ! ! *************** *** 125,139 ****
    ! ! &=">Previous Records !   ! ! ! &=">Next Records !   !
    ! !
    ! R?sultats ? de r?ponses
    ! ! D?sol?, aucun r?sultat !
    ! - Try another search - --- 117,132 ----
    ! !
    !
    R?sultats ? de r?ponses.
    ! !
    D?sol?, aucun r?sultat !
    ! ! !
    Essayez une autre recherche
    ! Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-search.tmpl 8 Dec 2003 16:27:45 -0000 1.8 --- opac-search.tmpl 11 Feb 2004 08:46:27 -0000 1.9 *************** *** 1,88 **** ! ! !

    Connect? en tant que: [Accueil lecteur][D?connecter]

    ! !

    S'identifier ? Koha

    !     ! ! !
    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - ! ! ! ! ! ! ! ! ! ! ! ! !
    Mot-clefs
    OU :
    Sujet
    OU un ou plus de : :
    TitreNormalExact
    Auteur
    Illustrateur
    Classe
    Code barre
    Notez que le mot clef est prioritaire
    !
    !
    ! --- 1,71 ---- ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + ! ! ! ! !
    Mot-clefs
    OU :
    Sujet
    OU un ou plus de : :
    TitreNormalExact
    Auteur
    Illustrateur
    Classe
    Code barre
    Notez que le mot clef est prioritaire
    !
    ! Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-user.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-user.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-user.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,19 **** ! ! ! ! ! ! --- 1,20 ---- ! ! !
    Est-ce correct?
    Carte lecteur:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !

    quelque chose ? modifier ??

    Mettre ? jour
    ! ! ! *************** *** 21,135 **** ! ! Bonjour, ! [D?connecter]

    ! ! ! !

    Est-ce correct
    Carte lecteur:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !
    quelque chose ? modifier \?

    Mettre ? jour +
    ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez des dettes de
    !     ! !
    ! ! Vous avez un cr?dit de
    !     ! Voir compte !     ! ! ! ! ! !
    ! ! Vous avez des r?servations en attente: -

    ! Prendre ? ::
    !     -

    - ! Vous avez Ouvrage en pr?t actuellement
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate retourType d'ouvrageChargesPr?t
    OuiNonOuiNon
    ! !

    Vous n'avez pas d'exemplaire en pr?t

    ! ! !

    ! ! ! Vous avez Ouvrages r?serv?s actuellement
    ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate r?servation
    !     ! --- 22,135 ---- ! !
    ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez des dettes de
    ! ! !
    ! ! Vous avez un cr?dit de
    ! !

    Voir compte

    ! ! ! ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! !
    ! ! Vous avez des r?servations en attente:
    TitreAuteurDate r?servationAnnexe de retrait
    ! "> 

     

    ! ! ! !

    You have Ouvrage en pr?t actuellement.

    ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate retourType d'ouvrageChargesPr?t
    "> YesNoYesNo
    ! !

    Vous n'avez pas d'exemplaire en pr?t.

    ! ! ! ! !

    You have Ouvrages r?serv?s actuellement.

    ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurDate r?servation
    "> 
    ! ! Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/opac-userupdate.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** opac-userupdate.tmpl 8 Dec 2003 16:27:45 -0000 1.5 --- opac-userupdate.tmpl 11 Feb 2004 08:46:27 -0000 1.6 *************** *** 1,56 **** ! ! !

    Connect? en tant que: [D?connecter]

    ! !

    S'identifier ? Koha

    !     ! Changer le n?cessaire
    ! Your changes won't appear until the library has validated them.

    ! !
    !
    ! ! ! ! ! ! ! ! ! - - ! ! ! ! - - ! ! ! !
    Nom
    Titre
    Pr?nom
    Adresse postale
    Ville
    T?l?phone maison
    Tel bureau
    Mail
    !
    !
    !
    !     ! ! --- 1,47 ---- ! !

    Changer le n?cessaire.
    ! Vos changement n'apparaitront que lorsque la biblioth?que les aura valid?.

    ! !
    ! ! ! ! ! ! ! ! ! ! ! + + ! ! ! ! + + + !
    Nom " name="surname">
    Titre " name="title">
    Pr?nom " name="firstname">
    Adresse postale " name="streetaddress">
    Ville " name="city">
    T?l?phone maison " name="phone">
    Tel bureau " name="faxnumber">
    Mail " name="emailaddress">
    !
    ! ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/fr/subject.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** subject.tmpl 8 Dec 2003 16:27:45 -0000 1.4 --- subject.tmpl 11 Feb 2004 08:46:27 -0000 1.5 *************** *** 1,44 **** ! ! ! !

    Connect? en tant que: [D?connecter]

    ! !

    S'identifier ? Koha

    !     ! !
    ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Sujet
    >
     

    ! Results ? de r?ponses
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Sujet
    ">
     

    ! R?sultats ? de r?ponses.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From tipaul at users.sourceforge.net Wed Feb 11 09:59:14 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:59:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.1,1.2 auth.tmpl,1.1,1.2 member-flags.tmpl,1.1,1.2 moditem.tmpl,1.1,1.2 modwebsites.tmpl,1.1,1.2 newjmember.tmpl,1.1,1.2 reports.tmpl,1.1,1.2 reservereport.tmpl,1.1,1.2 shelves.tmpl,1.1,1.2 stats.tmpl,1.1,1.2 updatebiblio.tmpl,1.1,1.2 bookcount.tmpl,1.1,1.2 boraccount.tmpl,1.4,1.5 charges.tmpl,1.1,1.2 default.tmpl,1.1,1.2 intranet-main.tmpl,1.6,1.7 mancredit.tmpl,1.1,1.2 maninvoice.tmpl,1.1,1.2 modbibitem.tmpl,1.1,1.2 modbib.tmpl,1.2,1.3 newimember.tmpl,1.2,1.3 newmember.tmpl,1.3,1.4 opac-main.tmpl,1.1,1.2 overdue.tmpl,1.1,1.2 request.tmpl,1.5,1.6 searchheader.tmpl,1.1,1.2 thesaurus_popup.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26987/koha-tmpl/intranet-tmpl/default/fr Modified Files: bookcount.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl modbibitem.tmpl modbib.tmpl newimember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl request.tmpl searchheader.tmpl thesaurus_popup.tmpl Added Files: about.tmpl auth.tmpl member-flags.tmpl moditem.tmpl modwebsites.tmpl newjmember.tmpl reports.tmpl reservereport.tmpl shelves.tmpl stats.tmpl updatebiblio.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: bookcount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** bookcount.tmpl 3 Feb 2003 10:54:59 -0000 1.1 --- bookcount.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,46 **** ! !
    !
    ! ! &type="intra"> () ! !

    ! ! ! ! ! ! ! ! ! ! !
    CODE BARRES !
    ! ! Site d'origine :
    ! Site actuel :
    ! Date d'arrivée sur le site actuel : !
    ! Nombre de sortie depuis cette date :
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Site Nombre de sorties Dernière apparition sur le site
    !
    ! !

    \ No newline at end of file --- 1,40 ---- ! !
    !
    !

    ! &type="intra"> ()

    !

    ! ! ! ! ! ! ! ! !
    ! CODE BARRE !
    ! ! Annexe propri?taire:
    ! Annexe:
    ! Date d'arriv?e ? l'Annexe:
    ! Nombre de pr?t depuis la date ci-dessus:
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Annexe Nombre de pr?ts Vu ? l'Annexe
    !
    ! ! Index: boraccount.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** boraccount.tmpl 18 Sep 2003 10:19:29 -0000 1.4 --- boraccount.tmpl 11 Feb 2004 08:58:38 -0000 1.5 *************** *** 1,10 **** ! ! Compte de ! !

    ! Ajouter une dette   ! Encaisser

    --- 1,10 ---- ! ! ! !

    Compte pour ">

    ! Cr?er une facture manuelle   ! Cr?er un cr?dit manuel

    *************** *** 15,40 ****

    /images/background-mem.gif" colspan=2>AMENDES ! & FRAIS/images/background-mem.gif" colspan=1>MONTANT/images/background-mem.gif" colspan=1>SOLDE !
    Total dû
    /images/background-mem.gif" colspan=2>AMENDES & FRAIS/images/background-mem.gif" colspan=1>MONTANT/images/background-mem.gif" colspan=1>DOIT ENCORE
    Total d?
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! \ No newline at end of file --- 1,32 ---- ! ! ! ! !

    ! Chaque champ/bo?te doit ?tre remplie avec le montant de l'amende, quand d?bute son calcul, sa p?riodicit?
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, apr?s 7 jours, chaque 7 jours.

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! \ No newline at end of file Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/default.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** default.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- default.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,35 **** !

    ! ! ! ! ! ! ! ! ! ! !
    TitreAuteurNbre de doc.Localisation
    >
    ! ! ! !
    &startfrom=>Résultats ! précédants &startfrom=>Résultats ! suivants

    ! Résultats à ! sur enregistrements. !
    ! !
    --- 1,28 ---- !
    ! ! ! ! ! ! !
    TitreAuteurNombre d'ouvragesBiblionumber
    >
    !
    ! &startfrom=>Previous Records ! ! &startfrom=>Next Records !

    ! R?sultats ? sur enregistrements. !
    ! Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** intranet-main.tmpl 4 Apr 2003 08:40:08 -0000 1.6 --- intranet-main.tmpl 11 Feb 2004 08:58:38 -0000 1.7 *************** *** 1,188 **** ! ! Bienvenue sur l'Intranet Koha ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,158 ---- ! ! ! ! Bienvenue dans l'intranet de Koha ! ! ! ! ! ! !
    Catalogue
    !
    ! Koha: Horowhenua Library Trust    		 ! ! !
    ! Après la saisie, ! pressez la touche Entrée.
    ! ! Recherche avancée (Plus d'options)
    ! !
    ! ! Lecteurs !
    ! ! !
    ! Après la saisie, ! pressez la touche Entrée.
    !
    Acquisitions
    !
    Etats
    !
    Paramètres
    !
    Circulation
    ! ! ! --- 7,11 ---- ! *************** *** 13,19 **** --- 13,19 ---- *************** *** 21,60 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + + + + ! ! *************** *** 191,195 ****
    /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
    /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Recherche Catalogue" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
    ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">    		   ! !
    !
    ! ! Saisissez une valeur et pressez la touche Entr?e..
    ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Recherche avanc?e (plus d'options)
    !
    ! ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
      ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Recherche Lecteur" name="member" hspace="0" vspace="0" border="0"> !
      
    ! !
    ! Saisissez une valeur et pressez la touche Entr?e..
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
         /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Acquisitions" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
         /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Accounts et Reports" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Param?tres" border="0">
    + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
      /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Circulation" hspace="0" vspace="0" border="0">
    - --- 161,164 ---- Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/mancredit.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** mancredit.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- mancredit.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,32 **** ! ! !
    !

    Crédit manuel

    !
    !
    ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Numéro de lecteur
    Type de crédit ! !
    Numéro de document
    Description
    Montant
    !
    ! ! \ No newline at end of file --- 1,22 ---- ! ! !

    Cr?dit manuel

    !
    ! ! "> ! ! ! ! ! ! !
    N? Lecteur
    Saisir ! !
    Itemnumber
    Description
    Montant
    !
    ! ! \ No newline at end of file Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maninvoice.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** maninvoice.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- maninvoice.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,37 **** ! ! !
    !

    Facture manuelle

    !
    !
    ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Numéro de lecteur
    Type de facture ! !
    Numéro de document
    Description
    Montant
    ! !
    !
    ! ! --- 1,25 ---- ! ! !

    Facture manuelle

    !
    ! ! "> ! ! ! ! ! ! !
    N? Lecteur
    Saisir ! !
    Itemnumber
    Description
    Montant
    !
    ! ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** modbibitem.tmpl 7 Aug 2003 14:41:23 -0000 1.1 --- modbibitem.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,5 **** ! !

    "&type=intra> ()
    ! Modifier Groupe -


    --- 1,5 ---- ! !

    "&type=intra> ()
    ! Modifier groupe


    *************** *** 7,11 ****
    Assigner ? un groupe existant
    RE-ASSIGNE AU GROUPE EXISTANT
    OR MODIFY DETAILS
    Item Type" size=20>
    URL" size="20">
    Class" size=20>
    Publisher" size=20>
    Place" size=20>
    ISBN" size=20>
    Publication Year" size=20>
    Pages" size=20>
    Illustrations" size=20>
    Volume" size=20>
    Notes">
    Size" size=20>
    --- 21,60 ----
    ou modifie les d?tails
    Cat?g ouvrage" size=20>
    URL" size="20">
    Cat?gorie" size=20>
    Editeur" size=20>
    Lieu" size=20>
    ISBN" size=20>
    Ann?e de publication" size=20>
    Pages" size=20>
    Illustations" size=20>
    Volume" size=20>
    Notes">
    Taille" size=20>
    *************** *** 68,96 **** ! CHANGES TO AFFECT THESE BARCODES
    ! Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.   ! Barcode ! Location ! Date Due ! Last Seen ! ! "> ! "&bib=""&bi="""> ! ! !

    ! --- 68,96 ---- ! MODIFS SUR CES CODES-BARRES
    ! S?lectionner TOUS les codes barre auxquels s'appliquent les changements. Les non-s?lectionn?s ne seront pas affect?s.   ! Code barre ! Localisation ! Date de retour ! Vu ! ! "> ! "&bib=""&bi="""> ! ! !

    ! *************** *** 99,106 **** ! HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some ! items, tick the appropriate ones and a new group record will be created automatically for them.

     

    ! --- 99,106 ---- ! AIDE: Vous doit click on the appropriate radio button (in the green boxes), et choose to either re-assign the item/s to a record already in the system, ou modifier this record. IF your changes only apply to some ! items, tick the appropriate ones et a new group record will be created automatically for them.

     

    ! Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbib.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** modbib.tmpl 6 Jun 2003 09:31:52 -0000 1.2 --- modbib.tmpl 11 Feb 2004 08:58:38 -0000 1.3 *************** *** 1,63 **** ! ! ">Modifier Liens web ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Auteur">
    Titre">
    R?sum?
    Sujet
    Copyright">
    Titre p?riodique">
    Autres auteurs">
    Sous titre">
    Titre uniforme">
    Notes
    P?riodique">

    ! ! --- 1,63 ---- ! ! ">Modifier Site Web Links
    ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Auteur">
    Titre">
    R?sum?
    Sujet
    Date Copyright">
    Titre S?ries">
    Auteur suppl?mentaire">
    Sous-titre">
    Titre uniforme">
    Notes
    P?riodiques">

    !
    ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/newimember.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** newimember.tmpl 6 Jun 2003 10:00:52 -0000 1.2 --- newimember.tmpl 11 Feb 2004 08:58:38 -0000 1.3 *************** *** 1,22 **** ! ! ! Les champs obligatoires ! suivants n'ont pas été saisis. Veuillez retourner à la page ! précédantes et compléter les champs. ! ! ! ! Numéro de carte erroné. ! ! Valeurs correctes. Cliquer sur OK pour valider.
    ! ! " value=""> !
    !     !     ! --- 1,180 ---- ! ! ! ! ! ! N? carte invalide.

    ! !

    Confirmer Enregistrement

    ! ! " > ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! !
    /images/background-mem.gif"> ! NOUVEAU LECTEUR !
    ! Nom ! ! !
    /images/background-mem.gif"> ! DETAILS LECTEUR !
    ! N? Lecteur ! ! !
    ! N? Carte ! ! !
    ! Annexe d'inscription ! ! !
    /images/background-mem.gif"> ! ADRESSE LECTEUR !
    ! Adresse postale ! ! !
    ! Adresse priv?e ! ! !
    /images/background-mem.gif"> ! DETAILS LECTEUR !
    ! T?l?phone (Accueil) ! ! !
    ! T?l?phone (Daytime) ! ! !
    ! Fax ! ! !
    ! E-mail ! ! !
    ! Ecriture d'un texte ! ! !
    /images/background-mem.gif"> ! DETAIL AUTRE CONTACT !
    ! Nom ! ! !
    ! T?l?phone ! ! !
    ! Relation ! ! !
    ! Notes ! ! !
    /images/background-mem.gif"> ! NOTES !
    ! Notes g?n?rales ! ! !

    ! Valeurs valides. Cliquez sur OK pour confirmer ce nouveau lecteur

    ! ! " value=""> !
    ! ! ! Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/newmember.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** newmember.tmpl 6 Nov 2003 10:18:34 -0000 1.3 --- newmember.tmpl 11 Feb 2004 08:58:38 -0000 1.4 *************** *** 1,10 **** ! ! !

    Confirmer l'enregistrement

    ! " > ! --- 1,10 ---- ! ! !

    Confirmer Enregistrement

    /images/background-mem.gif"> ! NOUVEAU LECTEUR
    ! " > ! *************** *** 14,47 **** ! " > ! --- 14,47 ---- ! " > ! *************** *** 51,55 **** --- 51,55 ---- *************** *** 59,83 **** ! " > ! --- 59,83 ---- ! " > ! *************** *** 88,92 **** --- 88,92 ---- *************** *** 96,105 **** ! " > ! --- 96,109 ---- ! " > ! *************** *** 109,142 **** ! " > ! --- 113,146 ---- ! " > ! *************** *** 146,150 **** --- 150,154 ---- *************** *** 154,171 **** ! " > ! --- 158,175 ---- ! " > ! *************** *** 175,187 **** --- 179,191 ---- *************** *** 191,195 **** --- 195,199 ---- *************** *** 199,207 **** ! " > ! --- 203,211 ---- ! " > ! *************** *** 209,251 ****
    /images/background-mem.gif"> ! NOUVEAU LECTEUR
    !
    /images/background-mem.gif"> ! Détails
    ! Numéro interne !
    ! Numéro de carte !
    ! Catégorie de lecteur !
    !
    /images/background-mem.gif"> ! DETAILS LECTEUR
    ! N? Lecteur !
    ! N? Carte !
    ! Cat?gorie Lecteur !
    !
    !
    !
    ! Date expiration !
    ! Annexe de rattachement !
    /images/background-mem.gif"> DETAILS PERSONNELS !
    ! Date d'expiration !
    ! Annexe d'inscription !
    /images/background-mem.gif"> DETAILS PERSONNELS !
    !
    !
    /images/background-mem.gif"> ! ADRESSE
    ! ! Male ! ! Female !
    /images/background-mem.gif"> ! ADRESSE LECTEUR
    !
    ! Adresse !
    /images/background-mem.gif"> ! CONTACTS
    ! Téléphone (maison) !
    ! Téléphone (bureau) !
    !
    ! Adresse priv?e !
    /images/background-mem.gif"> ! DETAILS LECTEUR
    ! T?l?phone personnel !
    ! T?l?phone professionnel !
    !
    !
    !
    ! Texte !
    /images/background-mem.gif"> ! AUTRES CONTACTS
    !
    ! Ecriture d'un texte !
    /images/background-mem.gif"> ! DETAIL AUTRE CONTACT
    !
    ! Téléphone !
    !
    ! T?l?phone !
    !
    !
    !
    /images/background-mem.gif"> NOTES !
    /images/background-mem.gif"> NOTES
    ! Notes générales !

    ! ! " value=""> !
    !

    ERREUR

    !

    Les champs suivants sont erron?s. Cliquer sur le bouton "retour" et corrigez.

    ! ! Num?ro carte lecteur vide
    !     ! ! Num?ro de carte invalide
    !     ! ! Zone sexe vide
    !     ! ! Zone nom vide
    !     ! ! Zone pr?nom vide
    !     ! ! Adresse vide
    !     ! ! Commune vide
    !     !     ! --- 213,255 ---- ! Notes g?n?rales !

    ! ! " value=""> !
    !

    ERREUR

    !

    Les champs suivants contiennent une valeur interdite. Cliquez sur le bouton Pr?c?dent et essayez ? nouveau :

    ! ! N? Carte
    ! ! ! N? carte invalide
    ! ! ! Sexe
    ! ! ! Pr?noms
    ! ! ! Nom
    ! ! ! Rue
    ! ! ! Localit?
    ! ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/opac-main.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac-main.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- opac-main.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,133 **** ! ! Bienvenue sur l'OPAC Koha ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Search the Catalogue
       
    ! !
    ! Après la saisie, pressez la touche Entrée.
    ! -Recherche avancée ! (Plus d'ptions)
    ! ! !

    ! !

    Connecté en tant que: ! [Déconnexion]

    ! !

    Connectez-vous à Koha

    ! !
    ! !
    !

    !

    --- 1,134 ---- ! ! WELCOME TO THE KOHA OPAC ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue et Lecteur Services    		Rechercher dans le catalogue
       
    ! !
    ! ! Saisir in the box et press the enter key.
    ! ! ! -Recherche avanc?e (plus d'options)
    ! ! !

    ! !

    Connect? comme: [D?connecter]

    ! !

    S'identifier ? Koha

    ! !
    ! !
    !

    !

    Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** overdue.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- overdue.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,38 **** ! ! ! ! ! ! Documents en retard au
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Date de retourLecteurTéléphoneTitreAuteur
    ?subject=Overdue: ">
    ! ! ! ! ! ! ! \ No newline at end of file --- 1,32 ---- ! ! ! !

    Ouvrages en retard depuis


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Date de retourUtilisateurT?l?phoneTitreAuteur
    ?subject=Signaler retard: ">
    ! ! ! ! Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/request.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** request.tmpl 17 Sep 2003 12:24:47 -0000 1.5 --- request.tmpl 11 Feb 2004 08:58:38 -0000 1.6 *************** *** 1,11 **** !

    ! "> ! "> ! R?server : ! > ! )

    --- 1,11 ---- ! ! "> ! "> !

    R?server: ! > !

    *************** *** 13,22 **** ! ! ! ! ! ! --- 13,22 ----
    /images/background-mem.gif">Ordre/images/background-mem.gif">N? lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Pris/images/background-mem.gif">R?serv?
    ! ! ! ! ! ! *************** *** 24,162 **** ! !
    /images/background-mem.gif">Rang/images/background-mem.gif">N? Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Ramassage/images/background-mem.gif">R?servation
    ! Prochain dispo,
    (ou choisir dans la liste ci apr?s)
    !

    ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">R?servation/images/background-mem.gif">Type exemplaire/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Date pub/images/background-mem.gif">Copies
    ! ! S?lection impossible ! ! > ! > ! ! ! ! ! ! !
    !

     

    !
    action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>Modifier r?servations existantes
    /images/background-mem.gif">Ordre/images/background-mem.gif">Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Pris/images/background-mem.gif">R?serv?
    ! > ! > ! > ! Exemplaire en attente ? > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Prochain dispo ! ! ! Seulement du type ! ! ! ! $type
    ! Supprimer une r?servation en choisissant "Suppr" dans la la liste d'ordre ! //images/2rightarrow.png">
    --- 24,161 ---- ! ! ! Prochain dispo, ou choix dans la liste ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">R?servation/images/background-mem.gif">Cat?g ouvrage/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Date de publication/images/background-mem.gif">Copies
    ! ! Ne peut pas ?tre s?lectionn? ! ! > ! > ! ! ! ! ! ! !
    !
    +

     

    !
    action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODIFIER DEMANDES EXISTANTES
    /images/background-mem.gif">Rang/images/background-mem.gif">Lecteur/images/background-mem.gif">Notes/images/background-mem.gif">Date/images/background-mem.gif">Ramassage/images/background-mem.gif">R?servation
    ! > ! > ! > ! Ouvrage en attente ? > ! ! ! ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;"> ! ! ! ! Suivant ! ! ! This type only : ! ! ! !
    ! Supprimer une demande en s?lectionnant "suppr." dans la liste. ! //images/2rightarrow.png"> !
    *************** *** 165,167 ****
    ! --- 164,166 ---- ! Index: searchheader.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/searchheader.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** searchheader.tmpl 3 Feb 2003 10:55:00 -0000 1.1 --- searchheader.tmpl 11 Feb 2004 08:58:38 -0000 1.2 *************** *** 1,4 **** ! >Résultats ! triés selon l'indice dewey | >Résultats ! triés selon la cote !
    --- 1,2 ---- ! >R?sultats with dewey | >R?sultats with biblionumber !
    Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** thesaurus_popup.tmpl 14 Nov 2003 22:00:44 -0000 1.3 --- thesaurus_popup.tmpl 11 Feb 2004 08:58:38 -0000 1.4 *************** *** 1,47 **** ! Saisie des entrées du thésaurus
    !

    ! Rechercher : "> ! "> ! "> !

    ! Descendre : ! "> ! "> ! "> ! ! !
    ! S?lectionner : ! "> ! "> ! ! "> ! ! !
    ! "> ! "> ! Ins?rer une nouvelle autorit? : "> !
    ! ! --- 224,239 ----

    ! "> ! Reading Record ! ! ! Index: pay.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/pay.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** pay.tmpl 18 Sep 2003 12:33:02 -0000 1.5 --- pay.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,49 **** ! ! Dettes à régler ! pour !

    ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! -
    AMENDES ! ET FRAISMONTANT ! DU
    ! " value="oui" checked>A payer ! ! " value="oui">Payé ! " value="wo">Abandonner ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value="">
     Montant total
    !

    !

     

    ! --- 1,48 ---- ! ! !

    Payer une amende pour

    +

    ! ! ! "> ! ! ! ! ! ! ! ! !
    AMENDES & FRAISMontant de l'avoir
    " value="no" checked>Unpaid ! " value="oui">Pay ! " value="wo">Writeoff ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value=""> ! " value="">
    Total d?
    !
    +

    !

     

    ! !
    ! ">Return to Lecteur Record ! ! ! Index: readingrec.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** readingrec.tmpl 18 Sep 2003 12:33:02 -0000 1.3 --- readingrec.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,38 **** ! ! ! ! ! ! ! ! ! !
    ! [&limit=full">Liste compl?te] ! [">Emprunts r?cents]
    &order=title&limit=">TITRE ! &order=author&limit=">AUTEUR ! ! &limit=">DATE Volume
    !   !   !   !  
    ! --- 1,55 ---- ! +

    +
    N? Lecteur: +
    N? Carte: +

    + + &limit=full">Full output +
    + +
    ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! &order=title&limit=">TITRE /images/background-mem.gif"> ! &order=author&limit=">AUTEUR /images/background-mem.gif"> ! &limit=">DATE RETOUR ! /images/background-mem.gif"> ! &order=returndate&limit=">RENDU ! /images/background-mem.gif"> Volume
    !   !   !   !   !   !
    ! !
    ! ">Return to Lecteur Record ! ! ! ! From tipaul at users.sourceforge.net Wed Feb 11 09:59:54 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 00:59:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/parameters categoryitem.tmpl,1.1,1.2 admin-home.tmpl,1.5,1.6 aqbookfund.tmpl,1.4,1.5 aqbudget.tmpl,1.4,1.5 authorised_values.tmpl,1.6,1.7 branches.tmpl,1.6,1.7 categorie.tmpl,1.5,1.6 charges.tmpl,1.1,1.2 checkmarc.tmpl,1.3,1.4 currency.tmpl,1.1,1.2 itemtypes.tmpl,1.2,1.3 koha2marclinks.tmpl,1.3,1.4 marc_subfields_structure.tmpl,1.3,1.4 marctagstructure.tmpl,1.7,1.8 printers.tmpl,1.1,1.2 stopwords.tmpl,1.2,1.3 systempreferences.tmpl,1.3,1.4 thesaurus.tmpl,1.5,1.6 z3950servers.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27288/koha-tmpl/intranet-tmpl/default/fr/parameters Modified Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Added Files: categoryitem.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: admin-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** admin-home.tmpl 6 Oct 2003 13:40:49 -0000 1.5 --- admin-home.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,93 **** !

    ! Page d'administration de koha
    ! ! /images/background-mem.gif"> !
    Param?tres
    ! ! ! ! ! ! ! ! ! ! ! - - - - - - - ! ! ! ! ! ! ! ! ! ! ! ! !
    En rapport avec les bibliographies
    Types d'exemplairesLes supports physiques d'un exemplaire
    FondsLes diff?rents fonds et leurs budgets
    AmendesLes amendes en fonction du type d'exemplaire et du type de lecteur.
    Valeurs autoris?esLes diff?rentes cat?gories et les valeurs autoris?es pour chaque cat?gorie. ! Les valeurs autoris?es sont utilis?es dans la saisie des notices MARc pour faciliter la saisie.
    Th?saurusGestion du th?saurus. Vous pouvez d?finir autant de th?saurus que n?cessaires au travers de la d?finition de "cat?gories" de th?saurus
    MARC
    Structure MARCLa structure MARC : les champs et les sous champs
    Liens koha - structure MARCLes liens entre la base "standard" de koha et la base MARC. Notez que ces liens peuvent ?tre d?finis depuis la structure MARC. Cet utilitaire est un raccourci pour valider et corriger les liens
    V?rifier la structure MARCV?rifie la structure MARC. UTILISEZ-LE avant de travailler avec des donn?es r?elles. Il vous indiquera les erreurs de configuration qui CASSENT la coh?rence de la base de donn?es
    Divers
    AnnexesLes diff?rentes annexes g?r?es par ce serveur koha
    cat?goriesLes diff?rents types de lecteurs
    MonnaiesLes monnaies des fournisseurs
    ImprimantesLes imprimantes (chemin UNIX)
    Mots videsListe des mots ignor?s pendant les recherches
    serveurs Z39.50Serveurs z39.50 pour rechercher des notices
    Pr?f?rences syst?mesLes pr?f?rences syst?mes.
    ! ! /images/background-mem.gif"> !
    Utilitaires
    ! ! ! ! ! ! ! ! ! ! -
    Export
    Export de noticesExport au format MARC
    Import
    D?charger des notices MARC
    dans le r?servoir    		Le r?servoir est une table ou sont stock?es des notices inactives.
    ! Une notice MARC est stock?e dans le r?servoir tant qu'il n'y pas d'exemplaire correspondant. Si vous entrez l'ISBN ou le titre d'un ouvrage, il est recherch? dans le r?servoir. ! S'il est trouv?, une notice active sera cr??e.
    ! --- 1,104 ---- !
    !

    Param?tres


    ! ! !
    Param?tres syst?me
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! + + + + + ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Remplir ces tables dans l'ordre pour obtenir un Koha qui fonctionne
    AnnexesLes diff?rentes annexes que vous g?rez avec ce serveur Koha.
     
    ComptesAdministration des comptes. N'oubliez pas d'?diter vos comptes avant de commencer ? ?diter les budgets..
    MonnaiesD?finir taux de change.
     
    Categ. ouvragesD?finir types de document.
    Cat?gories d'emprunteursD?finir cat?gories d'emprunteurs.
    FraisFrais en fonction du type de document / de lecteur.
     
    Valeurs autoris?esD?finir des cat?gories et des valeurs autoris?es pour eux. Les valeurs autoris?es sont utilis?es pour aider ? l'?dition des notices MARC..
    Th?saurusGestion du th?saurus et des fichiers autorit?s.
    Structure des ?tiquettes MARCstructure MARC: ?tiquettes puis sous-champs.
    Liens Koha - base de donn?es MARCD?finir les liens entre les bases de donn?es standards Koha et MARC. Ces liens peuvent ?tre d?finis ? partir de la structure MARC. Cet outil est simplement un raccourci pour acc?l?rer la cr?ation des liens..
    V?rification MARCContr?le la structure MARC. A utiliser avant de travailler avec de vraies donn?es. Cela permet de mettre en ?vidence les erreurs qui peuvent corrompre la base de donn?es.
    Divers param?tres
    ImprimantesImprinantes (chemin UNIX).
    Mots vide de sensMots effac?s lors des recherches.
    Serveurs Z39.50serveurs ? interroger pour des donn?es MARC.
    Pr?f?rences syst?mePr?f?rences syst?me.
    ! ! !
    Outils
    ! ! ! ! ! ! ! ! ! ! ! ! !
    Export
    Exporter une notice biblio MARC Exporter en format MARC.
    Importer
    Charger des notices MARC dans le r?servoirLe r?servoir est une table dans laquelle sont stock?es des notices qui seront r?cup?r?es pour un catalogage rapide..
    ! Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** aqbookfund.tmpl 4 Jul 2003 14:04:02 -0000 1.4 --- aqbookfund.tmpl 11 Feb 2004 08:59:50 -0000 1.5 *************** *** 1,52 **** ! ! ! Gestion du fonds documentaire !
    ! ! !
    ! !
    ! Votre recherche : !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaireNomModifSuppr
    ?op=add_form&bookfundid= ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&bookfundid=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
     Budget">//images/filenew.png" ALT="Add budget" border=0>
      ! - : ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

          
    //images/filenew.png" ALT="Add budget" BORDER=0 >

    !

     

    !
    ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaire">
    Fonds documentaire
    Nom 
    Groupe
     
    !     Données enregistrées !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! !
    !

     

    ! ! ! ! Donn?e supprim?e !
    ! !     !
    /images/background-mem.gif">Fonds documentaire/images/background-mem.gif">
    Nom
    Groupe
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! !
    --- 101,143 ---- } !

    !
    ! ! ! ! ! !
    Compte>
    Compte
    Nom 
     
    ! ! ! ! Donn?e enregistr?e !
    ! ! ! ! ! ! !
    !

     

    ! ! ! ! Donn?e effac?e ! ! ! ! Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** aqbudget.tmpl 4 Sep 2003 17:01:59 -0000 1.4 --- aqbudget.tmpl 11 Feb 2004 08:59:50 -0000 1.5 *************** *** 1,37 **** ! ! ! Gestion budgétaire !
    ! ! ! ! !
    ! Votre recherche !


    !

    Compte
    Nom
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! !
    /images/background-mem.gif">Fonds documentaire/images/background-mem.gif">Date de début/images/background-mem.gif">Date de fin/images/background-mem.gif">Montant du budget/images/background-mem.gif"> /images/background-mem.gif"> 
    ()">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    !
          
    //images/filenew.png" ALT="Add budget" BORDER=0 >

    !
    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Fonds documentaire>
    Fonds documentaire
    fonds">
    Date de début () 
    Date de fin ()
    Montant du budget">
     

    !

     

    !     Données enregistrées !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Budget/images/background-mem.gif">
    Date de début
    Date de fin
    Montant du budget
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! !
    !     ! ! ! Donn?e supprim?e !
    !     !     --- 77,149 ---- } !

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Compte>
    Nom de compte
    Comptes">
    Date de d?but () 
    Date de fin ()
    Montant budget
     ">

    !

     

    ! ! ! ! Donn?e enregistr?e !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Compte ! ! !
    Date de d?but
    Date de fin
    budgetamount
    CONFIRMER SUPPRESSION
    ! ! ! ! Donn?e effac?e !
    ! ! Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/authorised_values.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** authorised_values.tmpl 21 Oct 2003 15:47:06 -0000 1.6 --- authorised_values.tmpl 11 Feb 2004 08:59:50 -0000 1.7 *************** *** 1,111 **** ! ! !

    !
    ! ! ! ! ! ! ! !
    Catégorie
    Valeur autorisée
    Lib
     ">
    !     ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! Gestion des valeurs autoris?es !

    Cette table est utilis?e pour la d?finition MARC. Vous pouvez d?finir autant de cat?gories que vous le souhaitez et autant de valeurs autoris?es voulues dans chaque cat?gorie.

    !

    Lorsque vous d?finissez la structure de sous-champ MARC, il est possible de faire un lien entre le sous-champ et une valeur autoris?e. Lorsque l'utilisateur demande ? ajouter ou ? modifier une notice le sous-champ ! n'est pas renseign? par un champ vide mais par une liste de valeurs autoris?es.

    ! Nouvelle cat?gorie... ! !
    /images/background-mem.gif">Variable/images/background-mem.gif">
    Valeur
    CONFIRMEZ LA SUPPRESSION
    ! ! !
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Cat?gorie/images/background-mem.gif">Valeur autoris?e/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! !
    ! "> !
    //images/filenew.png" border="0">
    !
    ! ! --- 1,104 ---- ! ! !

    !
    ! ! ! ! ! !
    Cat?gorie
    Valeur autoris?e
    Lib
     ">
    ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! !

    Admin Valeurs autoris?es

    !

    Cette table est utilis?e dans les d?finitions MARC. Vous pouvez d?finir autant de cat?gories et autant de valeurs autoris?es pour chaque cat?gorie que vous voulez.

    !

    Quand vous d?finissez la structure des sous-champs MARC, vous pouvez lier un sous-champ ? une cat?gorie de valeurs autoris?es. Quand l'utilisateur ajoute ou modifie une notice biblio, la valeur du sous-champ n'est pas libre, mais doit appartenir ? la liste des valeurs autoris?es.

    ! Nouvelle cat?gorie... ! !
    VariableLib
    Valeur
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Cat?gorieValeur autoris?eLibEditerSupprimer
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! ! "> !

    ! ! ! Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/branches.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branches.tmpl 4 Jul 2003 14:04:02 -0000 1.6 --- branches.tmpl 11 Feb 2004 08:59:50 -0000 1.7 *************** *** 1,81 **** ! ! !
    ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code annexe ! ! ! ! ! ! !
    Nom 
    ! !
    >
    Adresse
     
     
    Téléphone
    Fax
    E-mail
     
    !
    !     ! Confirmez la suppression : !
    ! ! ! ! !
    ! !
    !
    ! ! !
    ! !
    !
    --- 1,82 ---- ! ! ! !


    ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code Annexe ! ! ! ! ! ! !
    Nom"> 
    !
    >
    Adresse
     
     
    T?l?phone
    Fax
    E-mail
     
    ! ! ! ! ! Confirmer suppression: !
    ! > !
    +
    + +
    + + + +


    + *************** *** 88,202 **** ! ! ! ! ! ! ! ! !
    Code AdresseCatégories    
    ! ! (nothing entered) ! ! ! ! !
    ! !
    ! !
    Ph:     ! !
    Fax:     ! !
    Email:     !     !     		! ! (no categories set) ! ! !
    !     !     !     		!
    ! ! !
    		!
    ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Catégories d'annexes
    NomCodeDescription  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !     ! !


    !
    ! ! ! --- 89,214 ---- ! ! ! ! ! ! ! ! !
    Code caté annexe ! ! ! ! ! !
    Nom"> 
    Description"> 
    Code AdresseCat?gories    
    ! ! (pas de saisie) ! ! ! ! !
    ! !
    ! !
    T?l.: ! !
    Fax: ! !
    E-mail: ! !     		! ! (pas de cat?gorie d?finie) ! ! !
    ! ! !     		! ! ! ! !
    ! !

    +
    method=post> + + +
    + +
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! Cat?gories Annexes !
    NomCodeDescription  
    !
    ! ! ! !
    !     		!
    ! ! !
    !
    !
    !
    method=post> ! ! !
    ! ! !


    !
    ! ! ! *************** *** 205,221 ****
    Code Cat?gorie ! ! ! ! ! !
    Nom"> 
    Description"> 
    ! ! ! Confirmer suppression : !
    !
    !
    !
    !     ! --- 217,233 ---- ! ! ! Confirmer suppression: !
    !
    !
    !
    ! ! Index: categorie.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** categorie.tmpl 5 Nov 2003 11:15:51 -0000 1.5 --- categorie.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,5 **** ! ! ! !

    Modifier categorie

    ! !

    Ajouter categorie

    !     ! !
    name=Aform method=post> ! ! ! ! ! ! ! ! ! ! ! ! --- 60,141 ---- ! !

    Modifier Cat?gorie

    ! !

    Ajouter une cat?gorie

    ! ! ! name=Aform method=post>
    Code catégorie ! >
    Code catégorie
    Description !  
    Dur?e insc. !
    Age maximum !
    Age Minimum !
    Frais inscription !
    Dépassement
    Nb maxi emprunts ! >
    Frais r?servation ! >
    ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 148,297 **** ! ! ! Valeurs enregistrées !
    method=post> !     ! ! TOTAL : :
    Code Cat?gorie ! ! >
    Code Cat?gorie
    Description !  
    Dur?e inscription !
    Age maxi !
    Age mini !
    Frais d'inscription !
    Avis de retard n?cessaire
    Limite de pr?t !
    Frais R?servation !
    ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Valeur supprim?e !
    !     ! !

    Administration cat?gorie

    ! ! Rechercher sur ! ! !
    ! > ! !
    ! Code cat&?acute;gorie !
    Description
    P?riode inscription
    Age maximum
    Age minimum
    Profil
    ???
    Frais inscription
    DépassementOuiNon
    Nb maxi emprunts
    Frais r?servation
    Valeur utilis?e fois.Suppression impossible
    !
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Cat?gorieDescriptionInscriptionAge maxiAge miniProfilDur?eFraisDepassnb max empruntfrais r?serv
    OuiNon/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>//images/edittrash.png" border="0">
    !

    !

    ! ! --- 149,297 ---- ! ! ! Donn?e enregistr?e !
    method=post>
    ! ! ! TOTAL : :
    ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donn?e effac?e ! ! ! !

    Admin Cat?gorie

    ! ! Votre recherche sur ! ! ! ! > ! !
    ! Code Cat?gorie !
    Description
    Dur?e inscription
    Age maxi
    Age mini
    Saisir d'amende
    Frais d'inscription
    Avis de retard n?cessaireOuiNon
    Limite de pr?t
    Frais R?servation
    This record is used times. Deletion not possible
    !
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Cat?gorieDescriptionDur?e inscriptionFrais d'inscriptionAge maxiAge miniAmendeSignaler retardLimite de pr?tR?server
    ! Oui ! ! Non ! ! /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>//images/edittrash.png" border="0">
    !

    !

    ! ! Index: charges.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/charges.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** charges.tmpl 6 Oct 2003 13:40:49 -0000 1.1 --- charges.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,33 **** !

    ! Chaque zone doit ?tre remplie avec : !

      !
    • Le montant de l'amende
      • !
    • Le retard tol?r? avant amende
      • !
    • La p?riode de r?p?tition de l'amende
      • !
    ! exemple : 1,7,7 1Euro d'amende apr?s 7 jours, tous les 7 jours.

    !

    Note : Les amendes sont calcul?es par le script fines2.pl situ? dans le r?pertoire misc. ! Demandez ? votre administrateur de mettre ce script dans la crontab (apr?s minuit) pour que les amendes soient calcul?es toutes les nuits.

    ! ! ! ! ! !
     
    ! "> ! " value="" size=6 maxlength=10>
    ! --- 1,27 ---- !

    ! Chaque champ/bo?te doit ?tre remplie avec le montant de l'amende, quand d?bute son calcul, sa p?riodicit?
    ! ex 1,7,7 = 1EUR,FS,CFA,etc d'amende, apr?s 7 jours, chaque 7 jours

    !

    Note : les amendes sont calcul?es par le misc/script fines2.pl. Demandez ? votre administrateur de mettre ce script dans le crontab, apr?s minuit, pour que les amendes soient calcul?es chaque nuit

    ! ! ! ! ! !
     
    ! "> ! " value="" size=6 maxlength=10>
    ! Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/checkmarc.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** checkmarc.tmpl 4 Sep 2003 15:03:00 -0000 1.3 --- checkmarc.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,128 **** ! ! /images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TestResult
    itemnum
  • Le champ "itemnum" DOIT ?tre connect? ? un champs MARC
    • !
  • Le sous champ correspondant DOIT ?tre dans le "tab" -1 (ignore)
    		•
    OKitemnum : le champ est connect? et dans le tab -1 (ignore)
    champ itemTOUS les sous champs des exemplaires (items) DOIVENT :
    !
  • ?tre reli?s ? 1 seul champ MARC (995 ? priori pour l'UNIMARC),
    • !
  • et ils doivent ?tre dans le "tab" 10 (items)
    		•
    OKTous les sous-champs des exemplaires (items) sont dans le m?me champ et dans le tab 10 (items)
    Table itemtypes videLa table itemtypes est vide. Elle doit contenir au moins 1 entr?e
    OKla table itemtypes contient 1 entr?e au moins
    itemtype NON connect? Le champ biblioitems.itemtype DOIT :
    !
  • ?tre connect? ? un sous-champ MARC
    • !
  • Le sous champ correspondant DOIT avoir authorised_value=itemtype
    		•
    OKbiblioitems.itemtype d?fini
    table branch est videLa table "branches" est vide. Elle doit contenir au moins 1 entr?e
    OKLa table "branches" contient au moins 1 entr?e
    branch NON connect?le champ Koha items.homebranch field DOIT :
    !
  • ?tre connect? ? un sous-champ MARC,
    • !
  • Le sous-champ correspondant DOIT avec authorised value=branch
    		•
    OKhomebranch d?fini
    holdingbranch NON connect?le champ Koha items.holdingbranch field DOIT :
    !
  • ?tre connect? ? un sous-champ MARC,
    • !
  • Le sous-champ correspondant DOIT avec authorised value=branch
    		•
    OKholdingbranch d?fini
    biblio et biblionumberLes champs Koha biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
    !
  • ?tre reli?s ? un sous-champ MARC
    • !
  • ?tre connect?s au m?me champ marc(par exemple : 090$a et 090$b)
    • !
  • Etre dans le "tab" -1
    		•
    OKbiblionumber et biblioitemnumber correctement d?finis
    TOTALIl y a erreurs dans votre configuration MARC. corrigez les avant d'utiliser Koha !!!
     Configuration OK, pas d'erreur dans les param?tres MARC
    ! --- 1,129 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TestR?sultat
    itemnum
  • Le champ itemnumb DOIT ?tre connect?
    • !
  • Le sous-champ correspondant DOIT ?tre dans l'onglet -1 (ignore)
    		•
    OKOuvrage : le champ itemnumber est connect? ? un sous-champ dans un onglet -1
    champ ouvrageTOUS les champs ouvrage DOIVENT :
    !
  • ?tre reli? ? la m?me ?tiquette,
    • !
  • et ils doivent tous ?tre dans l'onglet 10 (items)
    		•
    OKLes ?tiquettes d'exemplaire sont dans le m?me champ MARC et dans le m?me onglet.
    table types d'ouvrage est videLa table types d'ouvrage est vide. Elle doit contenir au moins une valeur
    OKtable types d'ouvrage remplie avec au moins une valeur
    itemtype n'est PAS connect? Le champ biblioitems.itemtype DOIT :
    !
  • ?tre reli? ? l'?tiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autoris?e=typeouvrage
    		•
    OKchamp biblioitems.itemtype d?fini
    Table Annexe videLa table Annexe est vide. Elle doit contenir au moins une valeur !
    OKtable Annexe remplie avec au moins une valeur
    Annexe propri?taire non reli?ele champ items.homebranch DOIT :
    !
  • ?tre reli? ? l'?tiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autoris?e=annexes
    		•
    OKAnnexe propri?taire d?finie
    Annexe d?positaire non reli?ele champ items.holdingbranch DOIT :
    !
  • ?tre reli? ? l'?tiquette MARC,
    • !
  • Le sous-champ correspondant DOIT contenir la valeur autoris?e=annexes
    		•
    OKAnnexe d?positaire d?finie
    notice bibliographique et n? biblioLes champs biblio.biblionumber et biblioitems.biblioitemnumber DOIVENT :
    !
  • ?tre reli? ? l'?tiquette MARC,
    • !
  • ?tre dans la MEME ?tiquette (par ex. : 090$a et 090$b)
    • !
  • ?tre dans l'onglet -1 (items)
    		•
    OKn? biblio et n? d'ouvrage corrects
    TOTALVous avez erreurs dans votre configuration MARC. Corrigez-les avant d'utiliser Koha
     Configuration OK. Vous n'avez pas d'erreurs dans la table des param?tres MARC.
    ! Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** currency.tmpl 6 May 2003 14:56:40 -0000 1.1 --- currency.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! ! !

    Modifier monnaie

    ! !

    Ajout monnaie

    !     !
    ! ! --- 56,78 ---- ! !

    Modifier Monnaie

    ! !

    Ajouter une monnaie

    ! !
    Monnaie !
    Monnaie
    ! ! *************** *** 81,90 **** ! --- 81,90 ---- ! *************** *** 96,127 **** ! ! ! Donnée enregistrée !
    !     !
    Monnaie !
    Monnaie
    Taux !
    Taux !
    ! ! ! ! ! --- 96,127 ---- ! ! ! Donn?e enregistr?e ! ! !
    Monnaie
    Taux
    ! Cette donnée est utilisée fois. Suppression impossible
    ! ! ! ! ! *************** *** 129,138 **** ! --- 129,138 ---- ! *************** *** 140,173 **** !
    Monnaie
    Taux
    ! This record is used times. Deletion not possible
    !
    CONFIRMER SUPPRESSION !
    CONFIRMER SUPPRESSION
    ! !
    ! ! ! Donnée supprimée !
    !     ! !

    Monnaies

    !
    ! > !
    ! ! Rechercher sur : ! --- 140,173 ---- !
    ! !
    ! ! ! Donn?e effac?e !
    ! ! !

    Admin Monnaies

    !
    ! > !
    ! ! Votre recherche sur ! *************** *** 178,211 **** ! ! ! ! ! ! !
    EditerSupprimer
    !
    ! ! << Prec !        ! ! Suiv >> !
    !
    !     ! --- 178,211 ---- ! ! ! ! ! Editer ! Supprimer ! !
    ! ! << Prev !        ! ! Suivant >> !
    !
    ! ! Index: itemtypes.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** itemtypes.tmpl 6 Nov 2003 10:18:34 -0000 1.2 --- itemtypes.tmpl 11 Feb 2004 08:59:50 -0000 1.3 *************** *** 1,3 **** ! ! ! !

    Modifier le type d'exemplaire

    ! !

    Ajouter le type d'exemplaire

    !     !
    ! ! ! ! ! ! ! ! ! ! ! ! --- 60,107 ---- } ! ! !

    Modifier categ. ouvrage

    ! !

    Ajouter cat?gorie d'ouvrage

    ! !
    Type exemplaire>
    Type exemplaire
    Description 
    Dur?e d'emprunt
    Renouvellement autoris?coch? value=1>
    Co?t emprunt
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 97,150 ****
    Cat?g ouvrage>
    Cat?g ouvrage
    Description 
    Non empruntable ! ! ! ! ! ! Si coch?, aucun ouvrage de ce type ne peut ?tre emprunt?. Sinon, les ouvrages peuvent ?tre emprunt?s sauf si le champ "notforloan" de l'ouvrage est coch?. !
    Dur?e de pr?t ! ! Utilis? seulement si "Non empruntable" n'est pas coch?. !
    Renouvellements autoris?schecked value=1>
    Co?t du pr?t
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type exemplaire
    Description
    Dur?e emprunt
    RenouvellementAutoris?Pas autoris?
    Co?t emprunt
    Cette donn?e est utilis?e fois. Suppression impossible
    CONFIRMER SUPPRESSION
    !     ! !

    Administration type exemplaire

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code ! DescriptionDur?e empruntRenouvelableCo?tModifierSupprimer
    YesNo?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

    --- 111,164 ----
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Cat?g ouvrage
    Description
    Dur?e de pr?t
    RenouvellementsAllowedNot allowed
    Co?t du pr?t
    This record is used times. Deletion not possible
    CONFIRMER SUPPRESSION
    ! ! !

    Admin Categ ouvrage

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Code ! DescriptionDur?e de pr?tRenouvelableFraisEditerSupprimer
    OuiNon?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !

    *************** *** 152,162 **** ! ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    !     ! --- 166,176 ---- ! ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/koha2marclinks.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** koha2marclinks.tmpl 14 Oct 2003 09:45:29 -0000 1.3 --- koha2marclinks.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,16 **** ! ! !

    !

    Choisir et valider 1 parmi les suivants :.

    !
    ! "> ! "> ! --- 1,16 ---- ! ! !

    !

    Choisir et valider une des suivantes pour .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! "> ! "> ! *************** *** 20,29 ****
    ! "> ! "> ! --- 20,29 ----
    ! "> ! "> ! *************** *** 33,42 ****
    ! "> ! "> ! --- 33,42 ----
    ! "> ! "> ! *************** *** 46,55 ****
    ! "> ! "> ! --- 46,55 ----
    ! "> ! "> ! *************** *** 59,68 ****
    ! "> ! "> ! --- 59,68 ----
    ! "> ! "> ! *************** *** 72,81 ****
    ! "> ! "> ! --- 72,81 ----
    ! "> ! "> ! *************** *** 85,94 ****
    ! "> ! "> ! --- 85,94 ----
    ! "> ! "> ! *************** *** 98,107 ****
    ! "> ! "> ! --- 98,107 ----
    ! "> ! "> ! *************** *** 111,120 ****
    ! "> ! "> ! --- 111,120 ----
    ! "> ! "> ! *************** *** 124,133 ****
    ! "> ! "> ! --- 124,133 ----
    ! "> ! "> ! *************** *** 138,183 ****
    !

    Pour déconnecter cliquer ==>

    		 ! ! "> ! "> !
    ! ! ! Liens MARC !

    NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez ? votre administrateur d'ex?cuter le script misc/rebuildnonmarc.pl

    !
    ! ! ! ! ! ! ! ! ! ! ! !
    Champ Koha ?ChampSous-champLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    !
    ! --- 138,183 ----
    !

    Pour "d?connecter" cliquer ==>

    		 !
    ! "> ! "> !
    ! ! ! Liens MARC !

    Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez ? votre administrateur de lancer le script misc/rebuildnonmarc.pl.

    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    champ Koha ?EtiquetteSous-champLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** marc_subfields_structure.tmpl 4 Jul 2003 14:04:02 -0000 1.3 --- marc_subfields_structure.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,129 **** ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Champliblibrarian / libopacIncrementationObligatoireChamp KohaBaliseValeur authorisée ou catégorie de thésaurus
    -
    !
    ! ou
    ! ou
    ! !

    Remarque : dans la dernière colonne vous avez le choix entre : !

      !
    • Une "valeur authorisée": qui se réfère ! à une liste de valeurs authorisées pour ce sous champ. Voir ! le tableau correspondant (admin table)
      • !
    • Une "catégorie thesaurus". Voir le tableau correspondant ! (admin table)
      • !
    • Un "créateur de valeurs" : les créateurs de valeurs ! sont des programmes Perl qui vous aident à sélectionner la ! valeur d'un champ. Ils sont dépendants de MARC et remplissent parfois ! automatiquement un autre sous champ.
      • !
    !

    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donn?es effac?es !
    !
    /images/background-mem.gif">Sous champ/images/background-mem.gif">
     
    CONFIRMEZ LA SUPPRESSION
    ! !
    "> ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" width=5%>Sous-champ/images/background-mem.gif" width=30%>Libell?/images/background-mem.gif" width=10%>champ koha ?/images/background-mem.gif" width=8%>Rep ?/images/background-mem.gif" width=8%>Oblig ?/images/background-mem.gif" width=8%>Onglet ?/images/background-mem.gif" width=8%>Val. autoris?e ?/images/background-mem.gif" width=8%>Thesaurus ?/images/background-mem.gif" width=8%>Plug-in ?/images/background-mem.gif" width=8%> 
    OuiNonOuiNon">//images/edittrash.png" border="0">
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    !     ! --- 1,112 ---- ! ! ! ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ChampLibell? OPACRepetobligatoirechamp KohaOngletValeur autoris?e ou
    ! Cat?gorie th?saurus
    - " size=40 maxlength=80>
    ! " size=40 maxlength=80>
    ! ou
    ! ou
    !

    Note: dans la derni?re colonne, vous pouvez choisir: !

    • Une "valeur autoris?e": se r?f?re ? une liste de valeurs autoris?es pour ce sous-champs. Voir la table admin correspondante..
      • !
    • Une "cat?gorie th?saurus": se r?f?re ? une cat?gorie du th?saurus. Voir la table admin correspondante..
      • !
    • Un "constructeur de valeur": les constructeurs de valeurs sont des programmes Perl qui vous aide ? s?lectionner les entr?es d'un champ selon une syntaxe MARC. Ils remplissent aussi parfois automatiquement des sous-champs..
      • !
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donn?e effac?e ! /images/background-mem.gif" width=5%>Sous-champ ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sous-champ
     
    CONFIRMER SUPPRESSION
    ">
    Libchamp Koha ?Rep ?obligatoire ?Onglet ?Valeur autoris?e ?Th?saurus ?Val build ?Supprimer
    OuiNonOuiNon">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** marctagstructure.tmpl 21 Oct 2003 15:47:07 -0000 1.7 --- marctagstructure.tmpl 11 Feb 2004 08:59:50 -0000 1.8 *************** *** 1,4 **** ! ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Champs
    Liblibrarian
    Libopac
    Incrementation
    Obligatoire
    Valeur autorisée (si vous sélectionnez une ! valeur ici, les indicateurs seront limités à la seule liste ! de valeurs autorisées)
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donn?es effac?es !
    !     ! ! Gestion de la structure de balisage MARC !

    NOTE : si vous modifiez un lien entre un sous champ MARC et une zone non-MARC, demandez ? votre administrateur d'ex?cuter le script misc/rebuildnonmarc.pl

    !
    ! ! !
    /images/background-mem.gif">Balise/images/background-mem.gif">
     
    CONFIRMEZ LA SUPPRESSION
    ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! -
    /images/background-mem.gif" width="5%">Balise/images/background-mem.gif" width="45%">Libell?/images/background-mem.gif" width="5%">R?p?table/images/background-mem.gif" width="5%">Obligatoire/images/background-mem.gif" width="10%">Valeurs
    		/images/background-mem.gif" width="16%">Sous champs/images/background-mem.gif" width="7%"> /images/background-mem.gif" width="7%"> 
    OUINONOUINON">Sous champs">//images/fileopen.png" border="0" height="25">">//images/edittrash.png" border="0" height="25">
    -
    - - - - - -
    ! //images/filenew.png" title="Ajouter" ALT="Add" BORDER=0 > ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    !     ! ! --- 52,152 ---- ! !

    !
    ! ! ! ! ! !
    Etiquette
    Libell? biblioth?caire
    Lib pour l'opac
    R?p?table
    Obligatoire
    Valeur autoris?e (Si vous s?lectionnez une valeur ici, les indicateurs seront limit?s une liste de valeurs autoris?es)
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donn?e effac?e ! ! ! !

    Admin Structure ?tiquette MARC

    ! Note : si vous changez le lien du sous-champ MARC vers un champ non-MARC, demandez ? votre administrateur de lancer le script misc/rebuildnonmarc.pl. ! ! ! !
    /images/background-mem.gif">etiquette/images/background-mem.gif">
     
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Etiquette/images/background-mem.gif">Lib/images/background-mem.gif">R?p?table/images/background-mem.gif">Obligatoire/images/background-mem.gif">Autoris?
    valeur    		/images/background-mem.gif">Sous-champs/images/background-mem.gif">Editer/images/background-mem.gif">Supprimer
    OuiNonOuiNon">subfields">//images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">//images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    + +
    ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> !
    ! ! Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** printers.tmpl 6 May 2003 14:56:40 -0000 1.1 --- printers.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! !

    Modifier imprimante

    ! !

    Ajout imprimante

    !     !
    --- 56,66 ---- !

    Modifier imprimante

    ! !

    Ajouter une imprimante

    ! ! *************** *** 68,94 **** ! ! ! ! ! ! ! ! --- 68,94 ----
    Nom imprimante !
    Nom imprimante
    Queue
    Type
    ! ! ! ! ! ! ! ! *************** *** 99,129 **** ! ! ! Donnée enregistrée !
    !     !
    Nom Imprimante !
    Nom Imprimante
    Queue
    Saisir
    ! ! ! ! ! ! --- 99,129 ---- ! ! ! Donn?e enregistr?e ! ! !
    Imprimante
    Queue
    Type
    ! ! ! ! ! ! *************** *** 132,140 ****
    Imprimante
    Queue
    Saisir
    ! !
    --- 132,140 ----
    ! !
    *************** *** 142,164 ****
    ! ! ! Donnée supprimée !
    !     ! !

    Imprimantes

    ! > !
    ! ! Rechercher sur : ! --- 142,164 ----
    ! ! ! Donn?e effac?e !
    ! ! !

    Admin Imprimante

    ! > !
    ! ! Votre recherche sur ! *************** *** 166,203 **** ! ! ! ! ! ! ! ! !
    Nom QueueType
    EditDelete
    !
    ! ! << Prec ! ! ! ! ! Suiv >> !
    !
    !     ! --- 166,204 ---- Nom Queue ! Saisir ! ! ! ! ! ! Editer ! Supprimer ! !
    ! ! << Prev ! ! !        ! ! ! Suivant >> !
    !
    ! ! Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** stopwords.tmpl 24 Nov 2003 17:00:09 -0000 1.2 --- stopwords.tmpl 11 Feb 2004 08:59:50 -0000 1.3 *************** *** 1,5 **** ! ! ! !

    Modifier mot vide

    ! !

    Ajouter mot vide

    !     !
    ! ! ! ! ! ! --- 53,81 ---- ! !

    Modifier un mot

    ! !

    Ajouter un mot

    ! !
    Mot vide !
    Mot vide
    ! ! ! ! ! ! *************** *** 84,106 ****
    Mot !
    Mot
    !     ! ! Mot vide enregistré !
    !     ! ! ! ! ! --- 84,106 ----
    Mot vide
    ! ! ! Donn?e enregistr?e !
    ! ! ! ! ! ! *************** *** 109,117 ****
    Mot
    ! !
    --- 109,117 ----
    ! !
    *************** *** 119,173 ****
    !     ! ! Donnée supprimée !
    !     ! !

    Mots vides

    ! NOTE : Si vous modifiez cette table, demandez ? votre administrateur syst?me d'ex?cuter le script misc/rebuildnonmarc.pl !
    ! > !
    ! ! Rechercher sur ! ! ! ! ! ! ! !
    Mot vide
    Delete
    !
    ! ! << Prec ! ! ! ! Suiv >> !
    !
    !     ! --- 119,175 ---- ! ! ! Donn?e effac?e !
    ! ! !

    Admin Mots vide

    ! Note : si vous changez quelque chose dans cette table, demandez ? votre administrateur de lancer le script misc/rebuildnonmarc.pl. !
    ! > !
    ! ! Votre recherche sur ! ! ! ! ! ! ! !
    Mot
    Supprimer
    !
    ! ! << Prev ! ! !        ! ! ! Suivant >> !
    !
    ! ! Index: systempreferences.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** systempreferences.tmpl 19 May 2003 13:53:46 -0000 1.3 --- systempreferences.tmpl 11 Feb 2004 08:59:50 -0000 1.4 *************** *** 1,3 **** ! ! ! ! !

    Modifier préférence système

    ! !

    Ajouter préférence système

    !     !
    ! ! ! ! ! !
    Variable
    Variable
    Value
    Explanation
     
    !     ! ! Donn?e enregistr?e !
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! Donn?e supprim?e !
    !     ! ! ! Administration des pr?f?rences syst?mes
    ! !
    /images/background-mem.gif">Variable/images/background-mem.gif">
    Value
    Confirmez la suppression
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Param?tre/images/background-mem.gif">Valeur/images/background-mem.gif">Explication/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    - - ! !
    -
    //images/filenew.png" border="0">
    -     ! --- 55,153 ---- ! ! ! !

    Modifier une pr?f?rence syst?me

    ! !

    Ajouter une pr?f?rence syst?me

    ! !
    ! ! ! ! ! !
    Variable
    Variable
    Valeur">
    Explication">
     
    ! ! ! Donn?e enregistr?e !
    ! ! ! ! ! ! ! ! ! ! !
    Variable
    Valeur
    CONFIRMER SUPPRESSION
    ! ! ! ! ! ! Donn?e effac?e !
    ! ! ! !

    Admin Pr?f?rences syst?me

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    VariableValeurExplication  
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>Editer">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>Supprimer
    ! !
    !
    method=post> ! ! !
    ! ! ! ! ! Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/thesaurus.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** thesaurus.tmpl 10 Jul 2003 14:11:46 -0000 1.5 --- thesaurus.tmpl 11 Feb 2004 08:59:50 -0000 1.6 *************** *** 1,161 **** ! ! ! Gestion du thesaurus
    ! !
    /images/background-mem.gif">Valeurs relatives à ! ()


    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Autres formes/images/background-mem.gif"> /images/background-mem.gif"> 
    ">//images/fileopen.png" border="0">">//images/edittrash.png" border="0">
    !
    ! "> ! "> !
    //images/filenew.png" border="0">
    !
    ! !

    ModificationAjout

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Catégorie
    Forme d'autorité" >" maxlength="80" size="80">
    Autre forme
     "> ! "> ! "> ! "> ! "> ! ">
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! !
    /images/background-mem.gif">lib/images/background-mem.gif">
    Valeur
    CONFIRMEZ LA SUPPRESSION de cet enregistrement ! et de tous les enregistrements dépendant de celui-ci
    ! ! !
    ! !
    !     ! ! Gestion du thesaurus !

    G?re le th?saurus et les listes d'autorit?.
    !

      ! Creuser : voir les donn?es d?pendantes de celle-ci
      ! Formes exclues : voir d'autres formes de ce terme d'autorit?

      !
    !
    ! ! "> ! ! Nouvelle cat?gorie... ! ! ! &rechercher cat?gorie=">
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" width="5%"> /images/background-mem.gif">Forme libre/images/background-mem.gif">Autorit?/images/background-mem.gif" width="8%">Creuser/images/background-mem.gif" width="8%">Exclues/images/background-mem.gif" width="8%"> /images/background-mem.gif" width="8%"> 
      CreuserExclues">//images/fileopen.png" border="0" height="25">">//images/edittrash.png" border="0" height="25">
    ! ! ! ! !
    !
    ! ! "> ! "> ! "> !
    //images/filenew.png" border="0">
    ! !
    ! ! --- 1,155 ---- ! ! ! Gestion du th?saurus
    ! !
    En liaison avec ()


    ! ! ! ! ! ! ! ! ! ! ! !
    autres formulaires  
    ">Editer">Supprimer
    ! ! "> ! "> !
    /images/filenew.png" title="Ajouter thesaurus entry" ALT="Add" BORDER=0 >
    ! ! ! !

    ModifierAjouter

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Cat?gorie
    Libell? autorit?" >" maxlength="80" size="80">
    Autre forme" maxlength="80" size="80">
     "> ! "> ! "> ! "> ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! !
    lib
    Valeur
    !
    ! ! ! "> !
    CONFIRMER SUPPRESSION de cette entr?e et toutes les entr?es d?pendantes de celle-ci
    ! ! !

    Gestion du th?saurus

    !

    Gestion du th?saurus et des fichiers autorit?s.
    !

      ! Extraire: Voir les formes associ?es
      ! Li?: Voir les formes rejet?es

      !
    !
    ! ! "> ! ! Nouvelle cat?gorie... !
    ! ! &search_category=">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     Formulaire libreAutorit?ExtraireLi?EditerSupprimer
      Extraire  Li?">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    !
    ! ! ! ! ! !
    " class="button">Previous" class="button"> Next
    !
    ! ! ! "> ! "> ! "> !

    ! ! ! ! ! Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** z3950servers.tmpl 6 May 2003 14:56:40 -0000 1.1 --- z3950servers.tmpl 11 Feb 2004 08:59:50 -0000 1.2 *************** *** 1,5 **** ! ! ! !

    ModifierServeur Z39.50

    ! !

    Ajouter Serveur Z39.50

    !     !
    ! ! ! ! ! --- 71,104 ---- ! !

    Modifier serveur Z39.50

    ! !

    Ajouter un serveur Z39.50

    ! !
    Serveur Z39.50 !
    Server Z39.50
    Hostname !
    ! ! ! ! ! *************** *** 106,145 **** ! ! ! ! ! ! ! ! ! ! ! !
    Serveur Z39.50 !
    Serveur Z39.50
    Nom de l'h?bergeur !
    Port !
    Database !
    Userid !
    Password !
    Actif !
    Priorit? (d'affichage) !
    Syntaxe (les serveurs renvoient les donn?es dans des formats variables. En choisir un) --- 106,145 ---- Port !
    Base de donn?es !
    Identifiant utilisateur !
    Mot de passe !
    Coch? (recherche par d?faut) !
    Rang (ordre d'affichage) !
    Syntaxe (Z39.50 peut envoyer des notices en diff?rents formats. S?lectionnez lequel) *************** *** 154,208 ****
    !     ! ! Donnée enregistrée !
    !     ! ! ! ! ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! --- 154,208 ----
    Site !
    Hostname
    Port
    Database
    Userid
    Password
    Checked
    Rank
    ! ! ! Donn?e enregistr?e !
    ! ! ! ! ! ! ! > ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 210,288 **** ! !
    Site !
    Nom de l'h?bergeur
    Port
    Base de donn?es
    Identifiant utilisateur
    Mot de passe
    V?rifi?
    Rang
    !     ! ! Donnée supprimée !
    !     ! !

    Serveurs z3950

    !
    ! > !
    ! ! Rechercher sur ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SiteHostnamePortDatabaseUseridPasswordCheckedRankSyntax
    //images/fileopen.png" ALT="Edit" title="edit" BORDER=0 >//images/edittrash.png" ALT="Delete" title="delete" BORDER=0 >
    !
    ! ! << Prec !        ! ! suiv >> !
    !
    !     ! --- 210,288 ---- ! !
    ! ! ! Donn?e effac?e !
    ! ! !

    Admin Serveurs Z39.50

    !
    ! > !
    ! ! Votre recherche sur ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SiteNom de l'h?bergeurPortBase de donn?esIdentifiant utilisateurMot de passeV?rifi?RangSyntaxe
    //images/fileopen.png" ALT="Edit" title="?diter" BORDER=0 >//images/edittrash.png" ALT="Delete" title="supprimer" BORDER=0 >
    !
    ! ! << Prev !        ! ! Suivant >> !
    !
    ! ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:23 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ selectbranchprinter.tmpl,1.1,1.2 branchtransfers.tmpl,1.4,1.5 circulation.tmpl,1.8,1.9 returns.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/circ Modified Files: branchtransfers.tmpl circulation.tmpl returns.tmpl Added Files: selectbranchprinter.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** branchtransfers.tmpl 22 Sep 2003 13:05:17 -0000 1.4 --- branchtransfers.tmpl 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 1,75 **** !
    ! Pr?t   ! Retours
    !

    Circulation: Transferts

    ! Annexe :
    ! Imprimante : Modifier ! > ! >

    ! ! ! > ! > !

    ! !

    /images/background-mem.gif">R?servation
    ! Reserv? : R?servation trouv?e pour (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Exemplaire en attente :
    ! L'exemplaire est marqu? en attente ? pour (" onClick="openWindow(this,'Member', 480, 640); return false;">).
     ! ! --- 1,78 ---- !
    ! Marquer reservation et transf?rer exemplaire ? : ! Supprimer r?servation et transf?rer :
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    supprimer r?servation et transf?rer:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignorer et retourner au transfert:
    ! > ! ! value=> ! value=> ! value=> ! !
    ! ! Emprunteur suivant ! ! Retours
    !

    Circulation: Transferts


    ! Annexe:   ! Imprimante:
    ! Changer Param?tres ! > ! >

    ! !
    /images/background-mem.gif">R?servation trouv?e
    ! R?serv?: R?servation trouv?e pour (" onClick="openWindow(this,'Lecteur', 480, 640); return false;">). ! Ouvrage marqu? en attente:
    ! Ouvrage est marqu? en attente ? for (" onClick="openWindow(this,'Lecteur', 480, 640); return false;">).
    ! ! *************** *** 77,159 ****
    ! Changer R?server en "en attente" et transf?rer le livre vers : ! Annuler r?servation et tenter un transfert:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Annuler r?servation et tenter un transfert:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignorer et retourner aux transferts:
    ! > ! ! value=> ! value=> ! value=> ! !
    ! !
    /images/background-mem.gif">Messages
    ! ! R?servation annul?e
    !     ! ! Exemplaire marqu? en attente au site :
    !     !     ! ! ! Pas d'exemplaire avec le code barre : ! ! ! Renvoyer exemplaire ? son propri?taire : ! ! ! L'exemplaire est d?j? not? arriv?. ! ! ! Exemplaire emprunt? par " ! onClick="openWindow(this,'Member', 480, 640); return false;"> ! et rendu !
    !
    ! /images/holder.gif" width=24 height=24>
    ! !
    /images/background-mem.gif"> ! Selectionner site
    Site destination :
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Code barre de l'exemplaire
    Code barre exemplaire:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Exemplaires transf?r?s
    Code barreTitreAuteurTypede?
    align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center> align=center> align=center>
    ! ! ! --- 80,162 ----

    ! !
    /images/background-mem.gif">Messages
    ! ! R?servation annul?e
    ! ! ! Ouvrage doit ?tre en attente ? l'annexe:
    ! ! ! ! ! No Ouvrage with barcode: ! ! ! Please return item to home branch: ! ! ! Ouvrage is already at destination branch. ! ! ! Ouvrage was on loan to " ! onClick="openWindow(this,'Lecteur', 480, 640); return false;"> ! et a ?t? retourn?. !
    !
    ! /images/holder.gif" width=24 height=24>

    ! !
    /images/background-mem.gif"> ! S?lectionner une annexe
    Annexe de destination:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Entrer Code barre du livre
    Code barre d'un ouvrage:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Ouvrages transf?r?s
    Code barreTitreAuteurSaisirDe?
    > ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">>> >>>
    ! ! ! Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** circulation.tmpl 29 Oct 2003 23:38:05 -0000 1.8 --- circulation.tmpl 11 Feb 2004 09:00:21 -0000 1.9 *************** *** 1,33 **** ! ! !
    ! &branch=&printer=&print=yes> ! Suivant  ! Retours  ! Transferts
    !

    Circulation: Retours


    ! Annexe:
    ! Imprimante:
    ! Modification paramètres
    ! > ! > !

    ! ! !

    ! Retours   ! Transferts --- 1,30 ---- ! ! !
    ! &printer=&print=oui"> ! Emprunteur suivant  ! Retours  ! Transferts
    !

    Circulation: Pr?ts

    ! Annexe: Imprimante: Changer Param?tres ! "> ! "> ! !
    ! Retours   ! Transferts *************** *** 35,61 ****
    !

    Circulation: Emprunts

    ! Annexe :
    ! Imprimante : Modifier
    !
    /images/background-mem.gif"> ! Question
    ! --- 32,59 ----
    ! Demande d'emprunt de ! par to . !

    !

    Circulation: Pr?ts


    ! Annexe:
    ! Imprimante:
    ! Changer Param?tres ! "> ! "> !

     

    ! ! ! ! ! ! --- 28,58 ---- ! ! *************** *** 61,68 **** ! ! --- 61,68 ---- ! ! Index: parameters-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** parameters-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- parameters-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Param?tres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Param?tres || ! A propos || ! Help Index: parameters-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** parameters-top.inc 7 Aug 2003 14:19:55 -0000 1.10 --- parameters-top.inc 11 Feb 2004 09:00:20 -0000 1.11 *************** *** 3,8 **** ! KOHA: INTRANET: Parameters ! /includes/common-style.css"> ! KOHA: INTRANET: Param?tres ! /includes/common-style.css">
    /images/background-mem.gif"> ! Question sur le pr?t
    ! *************** *** 64,104 **** !
    ! Attempting to issue ! by to . !

    ! --- 62,102 ---- ! ! ! !
    !
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    		!
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    ! *************** *** 109,218 ****
    !
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    		!
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    ! !
    Erreur emprunt

    ! ! ! ! !
    /images/background-mem.gif">Messages
    !     ! !
    ! > ! > ! ! !
    /images/background-mem.gif"> ! Selectionner lecteur
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! entrer un num?ro de carte lecteur
    ou une partie de son nom
    ! ! > ! >
    !     !
    ! *************** *** 176,182 ****
    !
    ! ! ! ! !
    ! ! ! --- 107,216 ----
    /images/background-mem.gif"> ! Code barre exemplaire
    ! ! ! ! !
    code barre :
    !
    ! ! !
    ! > Fixer date retour
    ! > ! > ! > ! ! ! ! > !
    ! !
    Erreur pr?t d'un livre

    ! ! ! ! !
    /images/background-mem.gif">Messages
    ! ! ! ! "> ! "> ! ! !
    /images/background-mem.gif"> ! S?lectionner un emprunteur
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Entrer N? carte de lecteur
    ou partie du nom
    ! ! "> ! ">
    ! ! !
    !
    ! !
    ! ! ! *************** *** 224,311 ****
    /images/background-mem.gif"> ! Entrer Code barre du livre
    ! ! ! ! !
    Code barre d'un ouvrage:
    !
    ! ! !
    ! > Sticky Date de retour
    ! "> ! "> ! "> ! ! ! ! "> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Informations lecteur
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Cat?gorie:
    Frais> onClick=\"openWindow(this, 'Payment', 480,640)\">Paiement
    Frais onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    En attente ! ! &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
    !
    RetardsOui, voir ci-dessous
    Notes
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Emprunts du jour
    Retour pour leCode barreTitreAuteurClasse
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Autres emprunts
    Retour pour leCode barreTitreAuteurClasse
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     - --- 222,318 ----

    		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Informations emprunteur
    ! " onClick="openWindow(this,'Lecteur', 480, 640)"> ! !
    Category:
    GNA>Emprunteur is gone with no address
    PERDU>Emprunteur's card is lost
    DBARRED>Emprunteur is debarred
    FRAIS>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    FRAIS" onClick="openWindow(this, 'Payment', 480,640)">Payment
    EN ATTENTE ! ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640)"> ()
    !
    RETARDSOui, voir plus bas
    NOTES
    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Pr?ts d'aujourd'hui
    Date de retourCode barreTitreAuteurCat?gorie
    >> ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">">">">
    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Pr?ts pr?c?dents
    Date de retourCode barreTitreAuteurCat?gorie
    ">"> ! &type=intra" onClick="openWindow(this, 'Ouvrage', 480, 640); return false;">">">">
    ! ! Index: returns.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** returns.tmpl 22 Sep 2003 13:05:17 -0000 1.4 --- returns.tmpl 11 Feb 2004 09:00:21 -0000 1.5 *************** *** 1,94 **** !
    ! Pr?ts !  Transfers
    !

    Circulation: Retours

    ! Annexe :
    ! Imprimante : Modifier ! > ! >

    ! --- 1,97 ---- !
    !
    /images/background-mem.gif">R?servations trouv?es
    ! ! Exemplaires en attente :
    ! L'exemplaire ()
    ! est en attente ? pour (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
    ! ! value=> ! value=> ! value=> !
    !     ! ! Item marked Waiting:
    ! L'exemplaire : ()
    ! doit ?tre transf?r? ?
    ! pour ?tre emprunt? par (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false;">).
    ! ! ! value=> ! value=> ! value=> ! !
    !     ! ! Reservation trouv?e : Exemplaire : () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">
    ! pour (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Member'); return false">) Pour ?tre ramass? ? . !
    Modifier statut ("attente") et imprimer d?placer?:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! Exemplaire r?serv? : () ! Code barre : ! Type : ! Provenant de : ! ! Emprunt? par : ! ! carte N?: ! Tel : ! ! ! ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "> !
    !
    ! ! Pr?ts  ! ! Transferts
    !

    Circulation: Retours


    ! Annexe:   ! Imprimante:
    ! Changer Param?tres ! > ! >

    ! *************** *** 96,151 **** ! !
    !
    /images/background-mem.gif">R?servation trouv?e
    ! ! Ouvrage marqu? en attente:
    ! Ouvrage ()
    ! est marqu? en attente ? for (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false;">).
    ! ! value=> ! value=> ! value=> !
    ! ! ! Ouvrage marqu? en attente:
    ! Ouvrage: ()
    ! doit ?tre transf?r? vers
    ! pour ?tre retir? ? (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false;">).
    ! ! ! value=> ! value=> ! value=> ! !
    ! ! ! R?servation trouv?e: Ouvrage: () &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;">
    ! for (" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=', 'Lecteur'); return false">) to be collected at . !
    Mettre le statut "Attente" et imprimerslip?:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ITEM RESERVED: () ! barcode: ! itemtype: ! COLLECT AT: ! ! BORROWER: ! ! card number: ! T?l?phone: ! ! ! ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "> !
    !
    !
    ! !
    /images/background-mem.gif"> ! code barre exemplaire
    code barre :
    ! ! value=> ! value=> ! value=> !
    		! !
    /images/background-mem.gif">Messages
    ! ! ! code barre inconnu: ! ! ! Retourner ? ! ! ! Pas emprunt?. ! ! ! Exemplaire perdu. Marqu? retrouv?. ! ! ! Exemplaire ?limin? !
    !
    !
    /images/background-mem.gif"> ! Retour d'exemplaire
    ! Titre:
    --- 99,154 ----
    !
    ! !
    /images/background-mem.gif"> ! Entrer Code barre du livre
    Code barre d'un ouvrage:
    ! ! value=> ! value=> ! value=> !
    		! !
    /images/background-mem.gif">Messages
    ! ! ! No Ouvrage with barcode: ! ! ! Please return to ! ! ! Not On Pr?t. ! ! ! Ouvrage was lost, now found. ! ! ! Ouvrage Annul? !
    !
    !
    /images/background-mem.gif"> ! Information sur un ouvrage retrouv?e
    ! Titre:
    *************** *** 153,237 ****     		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Information emprunteur
    ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ! ,
    /images/background-mem.gif" colspan=2> ! indicateurs
    >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Paiement
    > ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Item'); return false;">()
    !
    > ! ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;"> ! !
    !
    >
    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Exemplaires rendus
    Retour pour leCode barreTitreAuteurTypeEmprunteur
    > ! ! ! ! // ! ! ! ! Non emprunt? ! > align=center> ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Item'); return false;">>> align=center>> ! ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Member'); return false;"> ! ! ! ! !
    ! --- 156,240 ----     		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Informations Emprunteur
    ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Lecteur'); return false;"> ! ,
    /images/background-mem.gif" colspan=2> ! Drapeaux
    >" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=', 'Payment'); return false;">Payment
    > ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra','Ouvrage'); return false;">()
    !
    > ! ! ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;"> ! !
    !
    >
    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! Ouvrages rendus
    Date de retourCode barreTitreAuteurSaisirEmprunteur
    > ! ! ! ! // ! ! ! ! Pas en pr?t. ! >> ! &type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=&type=intra', 'Ouvrage'); return false;">>>>> ! ! " onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=','Lecteur'); return false;"> ! ! ! ! !
    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/includes about-bottom.inc,1.2,1.3 about-top.inc,1.3,1.4 acquisitions-bottom.inc,1.4,1.5 acquisitions-top.inc,1.8,1.9 cat-bottom.inc,1.4,1.5 cat-top.inc,1.12,1.13 circulation-bottom.inc,1.4,1.5 circulation-top.inc,1.11,1.12 common-style.css,1.4,1.5 issues-bottom.inc,1.4,1.5 issues-top.inc,1.3,1.4 members-bottom.inc,1.4,1.5 members-top.inc,1.10,1.11 opac-bottom.inc,1.3,1.4 opac-top.inc,1.3,1.4 parameters-bottom.inc,1.4,1.5 parameters-top.inc,1.10,1.11 reports-bottom.inc,1.4,1.5 reports-top.inc,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/includes Modified Files: about-bottom.inc about-top.inc acquisitions-bottom.inc acquisitions-top.inc cat-bottom.inc cat-top.inc circulation-bottom.inc circulation-top.inc common-style.css issues-bottom.inc issues-top.inc members-bottom.inc members-top.inc opac-bottom.inc opac-top.inc parameters-bottom.inc parameters-top.inc reports-bottom.inc reports-top.inc Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: about-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-bottom.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** about-bottom.inc 18 Sep 2003 12:32:40 -0000 1.2 --- about-bottom.inc 11 Feb 2004 09:00:20 -0000 1.3 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Param?tres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Param?tres || ! A propos || ! Help Index: about-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/about-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** about-top.inc 5 Jun 2003 12:40:49 -0000 1.3 --- about-top.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 3,11 **** ! KOHA: INTRANET: Parameters ! /includes/common-style.css"> ! --- 3,11 ---- ! KOHA: INTRANET: Param?tres ! /includes/common-style.css"> ! *************** *** 33,37 ****
    !
    --- 33,37 ----
    !
    *************** *** 50,54 **** ! Acquisition --- 50,54 ---- ! Acquisitions *************** *** 56,63 **** ! Etats ! Param?tres --- 56,63 ---- ! Rapports ! Param?tres *************** *** 72,78 ****
    ! !

    Logged in as: [Log Out]

    ! !

    Log In to Koha

    !     --- 72,78 ----
    ! !

    Connect? comme: [D?connecter]

    ! !

    S'identifier ? Koha

    ! Index: acquisitions-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** acquisitions-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- acquisitions-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 1,18 **** - -

     

    Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Param?tres || ! Aide
    --- 1,19 ----

     

    + +
    Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Param?tres || ! A propos || ! Help
    *************** *** 20,22 **** - --- 21,22 ---- Index: acquisitions-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/acquisitions-top.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** acquisitions-top.inc 5 Jun 2003 12:40:49 -0000 1.8 --- acquisitions-top.inc 11 Feb 2004 09:00:20 -0000 1.9 *************** *** 4,8 **** KOHA: INTRANET: Acquisitions ! /includes/common-style.css"> KOHA: INTRANET: Acquisitions ! /includes/common-style.css">     		! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 70,76 ****

    ! !

    Connect? en tant que : [Quitter]

    ! !

    Se connecter ? Koha

    !     --- 70,76 ----
    ! !

    Connect? comme: [D?connecter]

    ! !

    S'identifier ? Koha

    ! Index: cat-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** cat-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- cat-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Param?tres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Param?tres || ! A propos || ! Help Index: cat-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/cat-top.inc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** cat-top.inc 7 Aug 2003 14:19:55 -0000 1.12 --- cat-top.inc 11 Feb 2004 09:00:20 -0000 1.13 *************** *** 14,18 **** ! /includes/common-style.css"> !
    ! --- 60,83 ----
    --- 25,35 ---- font-weight: bold; } !
    ! !
    *************** *** 151,155 **** ! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 157,164 **** ! Marc ! ! Etats --- 54,58 ---- ! Rapports *************** *** 166,174 **** ! A propos
    		! A propos
    + + + + + + + + +
    options >>   + Adresse Lecteur + + Ajouter un lecteur + + Ajouter une organisation +
    ! !

    Connect? en tant que : [Log Out]

    ! !

    Se connecter ? Koha

    !     --- 85,91 ----
    ! !

    Connect? comme: [D?connecter]

    ! !

    S'identifier ? Koha

    ! Index: opac-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-bottom.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-bottom.inc 18 Sep 2003 12:32:40 -0000 1.3 --- opac-bottom.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 7,12 **** ! Recherche || ! Zone Lecteur || Accueil --- 7,13 ---- ! Recherche Catalogue || ! ! S'inscrire || Accueil Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/opac-top.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac-top.inc 5 May 2003 15:00:54 -0000 1.3 --- opac-top.inc 11 Feb 2004 09:00:20 -0000 1.4 *************** *** 4,8 **** ! KOHA: OPAC Catalogue Search --- 4,8 ---- ! KOHA: OPAC Recherche Catalogue *************** *** 28,58 ****
    KOHA: Catalogue SearchSearch ! ! My Settings ! ! Join ! Home
    /images/inside-top-search.gif" ! width=349 height=50 alt="KOHA: Recherche Catalogue" hspace=0 vspace=0 border=0>/images/mouseover-search.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-search.gif" ! width=71 height=30 alt="Chercher" hspace=0 vspace=0 border=0 name="menu-search"> ! /images/mouseover-mysettings.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'"> ! /images/menu-mysettings.gif" width=90 height=30 alt="My Settings" hspace=0 vspace=0 border=0 name="menu-mysettings"> ! /images/mouseover-join.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'"> ! /images/menu-join.gif" width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"> ! /images/mouseover-home.gif'" onMouseOut="document.mouseover.src='/images/holder.gif'">/images/menu-home.gif" ! width=60 height=30 alt="Accueil" hspace=0 vspace=0 border=0 name="menu-home">
    KOHA
    /images/inside-koha-bottom.gif" width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 >/images/holder.gif" width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" > !
    --- 31,35 ----
    !
    *************** *** 48,52 **** ! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 73,77 **** ! Valeurs auth --- 73,77 ---- ! Valeur autoris?e *************** *** 91,97 ****
    ! !

    Connect? en tant que: [D?connecter]

    ! !

    Se connecter ? Koha

    !     --- 91,97 ----
    ! !

    Connect? comme: [D?connecter]

    ! !

    S'identifier ? Koha

    ! Index: reports-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-bottom.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** reports-bottom.inc 18 Sep 2003 12:32:40 -0000 1.4 --- reports-bottom.inc 11 Feb 2004 09:00:20 -0000 1.5 *************** *** 8,18 **** Accueil || - Circulation || Catalogue || Lecteurs || Acquisitions || ! Etats || Param?tres || ! Aide --- 8,19 ---- Accueil || Catalogue || Lecteurs || Acquisitions || ! Circulation || ! Rapports || Param?tres || ! A propos || ! Help Index: reports-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/reports-top.inc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** reports-top.inc 5 Jun 2003 12:40:49 -0000 1.9 --- reports-top.inc 11 Feb 2004 09:00:20 -0000 1.10 *************** *** 3,8 **** ! KOHA: INTRANET: Reports ! /includes/common-style.css"> ! KOHA: INTRANET: Rapports ! /includes/common-style.css">
    		! Acquisition --- 48,52 ---- ! Acquisitions *************** *** 54,58 **** ! Etats --- 54,58 ---- ! Rapports *************** *** 70,76 ****
    ! !

    Connect? en tant que: [D?connecter]

    ! !

    Se connecter ? Koha

    !     --- 70,76 ----

    ! !

    Connect? comme: [D?connecter]

    ! !

    S'identifier ? Koha

    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio-nomarc.tmpl,1.1,1.2 additem-nomarc.tmpl,1.1,1.2 marcimport.tmpl,1.2,1.3 addbiblio.tmpl,1.10,1.11 addbooks.tmpl,1.3,1.4 isbnsearch.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: addbiblio.tmpl addbooks.tmpl isbnsearch.tmpl Added Files: addbiblio-nomarc.tmpl additem-nomarc.tmpl marcimport.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: addbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** addbiblio.tmpl 24 Nov 2003 16:28:49 -0000 1.10 --- addbiblio.tmpl 11 Feb 2004 09:00:21 -0000 1.11 *************** *** 1,15 **** ! !
    ! /images/background-mem.gif"> ! --- 1,15 ---- ! !
    Notice MARC :
    ! /images/background-mem.gif"> ! *************** *** 17,35 ****
    Notice biblio MARC :
    ! ! ! ! ! ! ! ! ! ! ! --- 17,39 ----
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 ! "> ! ! recherche z3950
    ! ! ! ! ! ! ! ! ! ! ! *************** *** 40,63 ****
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    		 ! "> ! ! ! ! ! ! Recherche Z39.50
    ! ! ! /images/background-mem.gif"> ! ! ! !
    ">"> - )">+
      * ! ! "> ! "> ! "> ! "> ! ">
    --- 44,78 ----
    ! ! ! /images/background-mem.gif"> ! ! ! ! + + + + +
    ">"> - )">+
      * ! ! "> ! "> ! "> ! "> ! ">
    +   + + +
    >>>>
    +     +
    *************** *** 65,88 **** --- 80,115 ---- *************** *** 90,113 **** --- 117,152 ---- *************** *** 115,138 **** --- 154,189 ---- *************** *** 140,163 **** --- 191,226 ---- *************** *** 165,188 **** --- 228,263 ---- *************** *** 190,213 **** --- 265,300 ---- *************** *** 215,238 **** --- 302,337 ---- *************** *** 240,263 **** --- 339,374 ---- *************** *** 265,288 **** --- 376,404 ---- *************** *** 290,323 **** ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> !
    --- 406,439 ---- ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! *************** *** 328,336 **** for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 444,452 ---- for (i=0; i < 10 ; i++ ) { ong = i+"XX"; ! link = "link"+i; if (numlayer==i) { document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 357,361 **** if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) { // We should not flag an error unless the tag is also ! // mandatory, or if something else in the tag is entered if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) { --- 473,477 ---- if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) { // We should not flag an error unless the tag is also ! // mandatory, ou if something else in the tag is entered if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) { *************** *** 385,400 **** var alertString2; if (total_errors!=0) { ! alertString2 = "Saisie invalide pour les raisons suivantes :\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; ! alertString2 += "- "+ total_missing_mandatory_tags +" zones obligatoires vides\n"; ! alertString2 += "- "+ total_missing_mandatory_subfields +" sous-zones obligatoires vides (voir sous-zones en gras)"; alert(alertString2); } else { ! document.f.submit(); } } function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=600,height=400,toolbar=false,scrollbars=yes'); } --- 501,516 ---- var alertString2; if (total_errors!=0) { ! alertString2 = "Form not submitted because sur the following problem(s)\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; ! alertString2 += "- "+ total_missing_mandatory_tags +" mandatory tags empty\n"; ! alertString2 += "- "+ total_missing_mandatory_subfields +" mandatory fields empty (see bold subfields)"; alert(alertString2); } else { ! document.forms[0].submit(); } } function Dopop(link,i) { defaultvalue=document.forms[0].field_value[i].value; ! newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=oui'); } *************** *** 415,420 **** } } ! newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes'); } function AddField(field) { document.forms[0].op.value = "addfield"; --- 531,537 ---- } } ! newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=oui'); } + function AddField(field) { document.forms[0].op.value = "addfield"; Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** addbooks.tmpl 3 Sep 2003 11:58:47 -0000 1.3 --- addbooks.tmpl 11 Feb 2004 09:00:21 -0000 1.4 *************** *** 1,18 **** ! ! Import et saisie de notices !

    ! Pas d'exemplaires ! !

    ! Site web ajout? !

    !
    Pour ajouter une nouvelle notice, scanner le code barre ou saisir l'ISBN/ISSN/titre de l'ouvrage
    --- 1,18 ---- ! ! G?rer une notice biblio MARC !

    ! Pas d'ouvrages trouv?s ! !

    ! Notice site Web ajout?e !

    !
    Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN.:
    *************** *** 22,29 **** ISBN: ! ! Si l'ouvrage est trouv? dans la table des notices actives, il sera rappel? et pourra ?tre modifi?.
    ! Si l'ouvrage est trouv? dans le r?servoir, il pourra ?tre appel? pour la saisie d'une nouvelle notice active.
    ! Sinon, il est possible de cr?er une notice ? partir de 0 Titre --- 22,29 ---- ISBN: ! ! Si l'ISBN ou le titre est trouv? dans la table biblio, il sera r?cup?r? et peut ?tre modifi?.
    ! Si l'ISBN ou le titre existe d?j? dans le r?servoir, il va ?tre r?cup?r? et une notice biblio sera ajout?e.
    ! Sinon, une notice biblio peut ?tre cr??e manuellement. Titre *************** *** 31,39 ****   ! ! Cr?er une notice vide ! ! Cr?er une notice vide ! --- 31,39 ----   ! ! Cr?er une notice biblio vide ! ! Cr?er une notice biblio vide ! *************** *** 44,48 **** !
    Ajout d'un site web
    --- 44,48 ---- !
    Ajouter un nouveau site Web
    *************** *** 50,59 **** ! !
    mot-clef:

    ! --- 50,59 ---- ! !
    Mot-cl?:

    ! Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** isbnsearch.tmpl 1 Apr 2003 13:46:43 -0000 1.2 --- isbnsearch.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,55 **** ! ! ! Résultats recherche de notices

    ! Votre recherche : ISBN , résultats trouvés
    ! Affichage des résultats à ! réponses
    ! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! !

    ! ! ! ! ! ! ! ! ! ! "> ! ! ! -
    TitreAuteurAnn?e 
    ! ">Editer...
    !

    !
    Notices dans le r?servoir
    --- 1,63 ---- ! ! R?sultats de recherche Biblio

    ! Recherche effectu?e sur ISBN title
    ! ! R?sultats trouv?s
    ! R?sultats to affich? !

    ! ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! !
    Notices bibliographiques dans Koha
    ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! !
    TitreAuteur© 
    ! ">Ajouter items">Editer...
    Rien trouv?

    !
    Notices bibliographiques dans le r?servoir
    *************** *** 59,75 **** Auteur ISBN ! vient de     ! ! "> ! ! ! ! ! ">cr?er notice !   --- 67,91 ---- Auteur ISBN ! provenant de     ! ! ! "> ! ! ! ! ! ! ! ! ">Ajouter une notice biblio ! ! ! ! Rien trouv? !   *************** *** 77,83 ****     ! ">Cr?er notice vierge ! --- 93,104 ----     ! ! ">Ajouter New Biblio ! ! ">Ajouter New Biblio ! !
    ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detailprint.tmpl,1.1,1.2 catalogue-home.tmpl,1.5,1.6 cmsdsearchresults.tmpl,1.1,1.2 detail-opac.tmpl,1.1,1.2 detail.tmpl,1.6,1.7 MARCdetail.tmpl,1.7,1.8 moredetail.tmpl,1.4,1.5 searchresults.tmpl,1.2,1.3 subject.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27462/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl MARCdetail.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Added Files: detailprint.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: catalogue-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/catalogue-home.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** catalogue-home.tmpl 18 Sep 2003 13:28:58 -0000 1.5 --- catalogue-home.tmpl 11 Feb 2004 09:00:21 -0000 1.6 *************** *** 1,12 **** ! ! ! ! !

    ! Recherche Catalogue
    --- 1,12 ---- ! ! ! ! ! !

    Recherche Catalogue

    *************** *** 14,29 **** ! ! ! - ! --- 14,31 ----
    Code barre exemplaires     OU
     
    ! Note :Utiliser un plus grand nombre de champs pour votre recherche (par ex. Mots-clés + auteur + cote) ralentira la recherche.

    ! ! ! ! *************** *** 33,45 **** !
    Code barre     OU
     
    ! AIDE
    ! Chercher :L'utilisation de plusieurs crit?res pour votre recherche ralentit le syst?me.

    ! ! --- 35,49 ---- !
    Mots-clés
    Titre ! Normal ! Exacte
    ! ! ! ! *************** *** 52,101 **** ! ! ! ! ! ! ! - ! ! !
    Mots-cl?s
    Titre ! Normal ! Exact
    Dewey
    Cote
    OU
    Sujet
    ! ! ! !
    ! !

    ! Etagères virtuelles !

    ! --- 56,110 ---- ! ! Dewey ! Cat?gorie ! ! OU ! Sujet ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! Rayonnages virtuels !
    ! !

    !

    Index: cmsdsearchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/cmsdsearchresults.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** cmsdsearchresults.tmpl 3 Feb 2003 11:12:14 -0000 1.1 --- cmsdsearchresults.tmpl 11 Feb 2004 09:00:21 -0000 1.2 *************** *** 1,27 **** ! Résultats de la recherche ! ! ! ! ! !
    TitreAuteurDewey
    ! &startfrom=>Résultats précédents ! &startfrom=>Résultats suivants
    !
    Résultats à sur enregistrements.
    --- 1,28 ---- ! R?sultats de recherche ! ! ! ! ! !
    TitreAuteurDewey
    ! &startfrom=>Previous Records ! &startfrom=>Next Records
    !
    ! R?sultats ? sur enregistrements.
    Index: detail-opac.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail-opac.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** detail-opac.tmpl 3 Feb 2003 11:12:14 -0000 1.1 --- detail-opac.tmpl 11 Feb 2004 09:00:21 -0000 1.2 *************** *** 1,23 **** ! - -

    Connecté: [Déconnexion]

    - -

    Se connecter à Koha

    -     ! ! ! () !

    ! --- 1,17 ---- ! ! ! () !

    ! NOTICE !
    ! *************** *** 26,74 ****
    ! Sous-titre:
    ! Auteur:
    ! Autre auteur:
    ! Collection:
    ! Sujet:
    ! Date de publi.:
    ! Notes:
    ! Unititle:
    ! Pério.:
    ! Nombre d'ex.:

    ! Notice bibliographique !
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type de doc.Cote LocalisationRetour leDernière transaction
    Site webdisponibleen ligne &bib=&bi=">http://

    --- 20,68 ----
    ! Sous-titre:
    ! Auteur:
    ! Auteur suppl?mentaire:
    ! Titre S?ries:
    ! Sujet:
    ! Copyright:
    ! Notes:
    ! Titre uniforme:
    ! P?riodiques:
    ! Nombre total d'ouvrages:

    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Cat?g ouvrageCat?gorie LocalisationDate de retourVu
    Site WebEn ligneDisponible &bib=&bi=">http://

    *************** *** 78,80 ****

    ! --- 72,74 ----

    ! Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** detail.tmpl 14 Oct 2003 11:37:48 -0000 1.6 --- detail.tmpl 11 Feb 2004 09:00:21 -0000 1.7 *************** *** 1,114 **** ! ! ! ! ! !

    () ! ! ! ! class="button">Réservations ! !

    ! ! !
    ! Notice N?
    !
    " class="button">MARC

    ! Sous-titre: ! Auteur: >
    ! Autre Auteur:
     ! Publi? par : ! en ! , ! ,
    ! Collection:
    ! Sujet:
    ! Année:
    ! Notes:
    ! Titre uniforme:
    ! Périodique:
    ! C?te dewey :
    ! URL :
    ! Nbre total d'exemplaires: !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Type de documentCoteLocalisationRetour prévuDernière transactionCode-barresVolume
    >&item=&bi=">&item=>Fix Itemtype
    Site webdisponibleen ligne&bib=&bi=">http://

    - - - -

    HELP
    - Mettre à jour la notice pour tous les exemplaires: cliquez sur le bouton Modifier - [à gauche] pour modifier la notice. Tout changement sera répercuté sur la notice de tous les exemplaires ci-dessus.

    - Mettre à jour la notice pour UN ou QUELQUES exemplaires: - Si certains exemplaires ci-dessus doivent avoir une notice différente, ou sont liés à la mauvaise notice, vous devez utiliser le module - acquisitions. Vous devrez "re-commander" les exemplaires, et les effacer de cette notice. -


    --- 1,99 ---- ! ! ! ! ! ! ! ! !
    ! >Requests !
    ! ! () !

    ! ! !
    ! Notice bibliographique
    !
    " class="button">MARC

    ! ISBN:">
    ! Sous-titre:
    ! Auteur: ">
    ! Auteur suppl?mentaire:
    ! Publi? par : ! en ! , ! ,
    ! Collection:
    ! Sujet:
    ! Ann?e :
    ! Notes:
    ! Titre uniforme:
    ! P?riodiques:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Nombre total d'ouvrages:
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Cat?g ouvrageLocalisationDate de retourVuCode barreVolume
    &item=&bib=&bi="> ! &item=>Fix Itemtype !
    Site WebEn ligneDisponible ! &bib=&bi=">http:// !


    *************** *** 119,128 **** Résumé ! ! ! --- 104,113 ---- R?sum? ! ! ! *************** *** 130,147 **** ! ! ! !
    Liens vers des sites web associés
    Titre:
    ! Description:
    ! URL:">http://
    --> ! --- 115,133 ---- ! ! ! !
    Links to ! Associated Websites
    Titre:
    ! Description:
    ! URL:">http://
    --> ! Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** MARCdetail.tmpl 6 Nov 2003 17:18:30 -0000 1.7 --- MARCdetail.tmpl 11 Feb 2004 09:00:21 -0000 1.8 *************** *** 1,3 **** ! --- 1,10 ---- ! ! !
    *************** *** 5,16 ****
    ! /images/background-mem.gif"> !
    ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">NormalMARC biblio :
    --- 12,24 ----     		! /images/background-mem.gif"> !
    ! ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">ImprimerNotice biblio MARC :
    *************** *** 31,35 ****
    8
    9
    Exemplaire
    --- 39,43 ----
    8
    9
    Ouvrage
    *************** *** 39,62 ****     		! ! ! class="button">Réservations !
    -
    ! ! /images/background-mem.gif"> ! ! ! ! ! --- 47,69 ----
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! ! class="button">R?servation !
    ! ! /images/background-mem.gif"> ! ! ! ! ! *************** *** 67,82 ****
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! ! !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    --- 74,89 ---- *************** *** 84,99 **** --- 91,106 ---- *************** *** 101,116 **** --- 108,123 ---- *************** *** 118,133 **** --- 125,140 ---- *************** *** 135,150 **** --- 142,157 ---- *************** *** 152,167 **** --- 159,174 ---- *************** *** 169,184 **** --- 176,191 ---- *************** *** 186,201 **** --- 193,208 ---- *************** *** 203,218 **** --- 210,225 ---- *************** *** 220,231 **** --- 227,238 ---- *************** *** 240,244 **** document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; --- 247,251 ---- document.getElementById(ong).style.visibility="visible"; document.getElementById(link).style.backgroundColor="#11AA11"; ! document.getElementById(link).style.backgroundImage="url(/images/background-mem.gif)"; } else { document.getElementById(ong).style.visibility="hidden"; *************** *** 251,257 **** var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&oldbiblionumber="; } } --- 258,267 ---- var is_confirmed = confirm('Confirmez vous la suppression ?'); if (is_confirmed) { ! window.location="acqui.simple/addbiblio.pl?op=delete&bibid="; } } + function Dopop(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** moredetail.tmpl 12 Sep 2003 13:26:59 -0000 1.4 --- moredetail.tmpl 11 Feb 2004 09:00:21 -0000 1.5 *************** *** 1,49 **** !

    !
    ! >Réservations

    &type=intra> ! ()

    ! > ! > ! --- 1,49 ---- !

    !
    /images/background-mem.gif" ! > GROUPE -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! numéro de notice:
    ! Type de document:
    ! URL :
    ! Durée de prêt :
    ! Coût du prêt :
    ! Cote :
    ! ISBN:
    ! Editeur :
    ! Lieu :
    ! Date:
    ! Volume :
    ! Pages :
    ! Ill :
    ! Taille :
    ! Notes :
    ! Nbre d'exemplaires :
    ! >Requests

    &type=intra> ! ()

    ! > ! > ! *************** *** 51,95 ****
    /images/background-mem.gif" ! > GROUP -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Biblionumber:
    ! Cat?g ouvrage:
    ! URL:
    ! Dur?e de pr?t:
    ! Co?t du pr?t:
    ! Classification:
    ! ISBN:
    ! Editeur:
    ! Lieu:
    ! Date:
    ! Volume:
    ! Pages:
    ! Ill.:
    ! Taille:
    ! Notes:
    ! Nombre d'ouvrages:

    !     ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">CODE-BARRES !
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Localisation d'origine :
    ! Dernière transaction :
    ! Dernier emprunt :
    ! ! Dernier emprunteur 1 :
    ! Last Borrower 2 :
    ! Localisation actuelle :
    ! Prix de remplacement :
    ! Exemplaire perdu :
    ! Payé :
    ! Notes:
    ! Prolongations :
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Cancelled:
    &bi=&itm=> ! Nbre total de prets :
    ! Numéro de groupe :
    ! Numéro de notice :
    --- 51,95 ----
    ! ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">CODE BARRE !
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Annexe propri?taire:
    ! Vu:
    ! Dernier pr?t:
    ! ! Dernier emprunteur 1:
    ! Dernier emprunteur 2:
    ! Annexe:
    ! Prix Remplacement:
    ! Ouvrage perdu:
    ! Pay? pour:
    ! Notes:
    ! Renouvellements:
    ! &biblio=&invoice=&catview=oui"> Accession ! Date:
    ! Annul?:
    &bi=&itm=>Total ! Pr?ts:
    ! N? Groupe:
    ! N? Biblio:
    *************** *** 100,104 ****
    !

    --- 100,104 ---- !

    *************** *** 106,108 ****

    ! --- 106,108 ----
    ! Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** searchresults.tmpl 4 Sep 2003 16:01:02 -0000 1.2 --- searchresults.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,114 **** ! ! ! ! !
    - -

    Connecté: [Déconnexion]

    - -

    Se connecter à Koha

    -     ! ! Votre recherche : ! ! Vous n'avez spécifié aucun critère de recherche
    !     ! ! résultats trouvés

    ! ! ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! !

    ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    TitreAuteurAnnéeNbre d'exemplairesLocalisation 
    ?type=opacintra&bib=>&type=opacintra> >Réservation
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Résultats précédents ! !   ! ! ! ! &=&type=opacintra>Résultats suivants ! !   ! !
    !
    ! !
    ! Résultats à sur enregistrements. !

    ! ! Essayez une nouvelle recherche ! ! ! Essayez une nouvelle recherche ! ! ! ! ! ! ! ! --- 1,101 ---- ! ! ! ! !
    + + Recherche effectu?e sur + + Vous n'avez pas sp?cifi? de crit?re
    + ! R?sultats trouv?s

    + + + &=&type=opacintra>/images/numbers/prev.gif border=0> + + /images/numbers/placeholder.gif border=0> + + + + /images/numbers/-highlight.gif> + + &=&type=opacintra>/images/numbers/.gif border=0> + + + + &=&type=opacintra>/images/numbers/next.gif border=0> + + /images/numbers/placeholder.gif border=0> + !

    ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! !
    TitreAuteur©Nombre d'ouvragesLocalisation 
    ?type=opacintra&bib=>&type=opacintra> >R?servation
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! ! !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! ! &=&type=opacintra>Next Records ! !   ! !
    !
    ! !
    ! R?sultats ? sur enregistrements. !

    ! ! Essayer une autre recherche ! ! ! Essayer une autre recherche ! ! ! ! ! ! ! ! Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** subject.tmpl 1 Apr 2003 13:50:05 -0000 1.2 --- subject.tmpl 11 Feb 2004 09:00:21 -0000 1.3 *************** *** 1,41 **** ! ! ! ! ! ! ! !

    Connecté: [Déconnexion]

    ! !

    Se connecter à Koha

    !
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif">
    Sujet
    opacintra&subjectitems=>
    ! ! !
    ! &startfrom=>Résultats précédents ! ! &startfrom=>Résultats suivants !
    !

    ! Résultats à sur résultats.
    ! ! ! ! ! --- 1,51 ---- ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Sujet
    ! !
    ! ! ! ! ! !
    ! ">Previous Records ! ! ">Next Records !
    !

    ! R?sultats ? sur enregistrements.
    ! ! ! ! ! From tipaul at users.sourceforge.net Wed Feb 11 10:00:49 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Wed, 11 Feb 2004 01:00:49 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.3,1.4 acquire.tmpl,1.1,1.2 basket.tmpl,1.5,1.6 newbasket2.tmpl,1.4,1.5 newbasket.tmpl,1.1,1.2 newbiblio.tmpl,1.5,1.6 order.tmpl,1.3,1.4 recieveorder.tmpl,1.1,1.2 recieve.tmpl,1.1,1.2 supplier.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27625/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl newbasket.tmpl newbiblio.tmpl order.tmpl recieveorder.tmpl recieve.tmpl supplier.tmpl Log Message: synch'ing 2.0.0 branch (RC4 tag) and head Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** acqui-home.tmpl 22 Sep 2003 13:04:48 -0000 1.3 --- acqui-home.tmpl 11 Feb 2004 09:00:47 -0000 1.4 *************** *** 1,14 **** ! ! Acquisitions
    ! !
    ! D?buter, r?ceptionner, modifier une commande
    N? ou nom du vendeur
    --- 1,14 ---- ! !

    Acquisitions


    ! !
    ! COMMENCER, RECEVOIR, MODIFIER UNE COMMANDE
    Nom du fournisseur *************** *** 18,96 ****
    !
    ! ! ! ! ! -
    Budgets
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    BudgetsTotalD?pens?Engag?Dispo
    Total

    ! Utiliser la fonction "mise ? jour" (ctrl-r) pour mettre ? jour les valeurs. ! Les montants engag?s sont approximatifs, ils varient en fonction des taux de change.
    ! ! ! ! !
    Taux de change
    ! ! " value=>

    ! Aide
    ! Commande:

    Pour d?buter une acquisition, chercher tout d'abord le vendeur. Vous pourrez ensuite cr?er un nouveau "panier".

    !

    Pour commander un exemplaire, vous devez v?rifier qu'une notice existe d?j?, et soit ajouter un exemplaire, soit cr?er une nouvelle notice et y ajouter un exemplaire

    !

    Pour commencer un nouveau panier avec un nouveau fournisseur, revenez ? cette page, et passez par la recherche d'un fournisseur

    !

    Pour cloturer un panier, cliquer sur "voir panier", et choisir "confirmer panier"
    ! --- 18,115 ----
    ! ! ! !
    ! RECEPTIONNE OU MODIFIE UNE COMMANDE PERIODIQUE !
    Recherche Titre !
    ! !
    + +
    + ! ! ! ! !
    TAUX DE CHANGE
    ! ! " value=>
    + + + + + + + + + + +
    BUDGETS ET COMPTES
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Budgets TotalD?pens?Engag?Disp.
    Total
    +

    + Rafraichissez la page pour avoir les derniers chiffres. Les montants engag?s sont approximatifs, car les taux de change peuvent modifier le montant effectivement pay?. +

    +
    +
    !

    AIDE commande:

    !
      Pour faire une acquisition, soit par commande, par achat direct ou par un don, commencer par rechercher le fournisseur. Ajoutez-en un si n?cessaire.
    !
      S?lectionnez ensuite un panier ou cr?ez-en un nouveau. Note: le panier sera rattach? ? cet utilisateur
    !
      Pour commander un ouvrage, une notice biblio doit exister pour l'ajouter ou alors il faut d'abord cr?er une nouvelle notice biblio avant de l'ajouter.
    !

    Pour quittez un panier, cliquez sur "Voir les paniers" ou Recherche ci-dessus, puis cliquez sur "Confirmer le panier".
    ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acquire.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- acquire.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,14 **** !
    ! Facture :
    ! R?ceptionn?e par :
    !
    ! R?ception pour : facture,
    !
    ! - Receive Order
    ! Panier pour : !
    Commande pass?e le :

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 25,73 ---- !

    - Recevoir Commande


    ! Panier pour: !
    Commande envoy?e:

    /images/background-mem.gif" colspan=2> ! D?tail catalogue
    Titre *" >
    Auteur" >
    Copyright" >
    Format
    ISBN">
    titre p?riodique">
    Site
    code barre exemplaire *">
    ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 77,91 **** --- 77,91 ---- *************** *** 93,134 ****
    /images/background-mem.gif" colspan=2> ! DETAILS CATALOGUE
    Titre *" >
    Auteur" >
    Date Copyright" >
    Format
    ISBN">
    S?ries">
    Annexe
    Code barre d'un ouvrage *">
    ! > ! > ! > ! "> ! "> ! "> ! ! /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> ! ! &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0> !
    ! > ! > ! > ! "> ! "> ! "> ! ! ! ! &id=>Editer !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>D?tails financiers
    Fonds *
    Quantit? command?e">
    Quantit? Re?ue *">
    Cout remplacement">
    cout budg?t?">
    Cout r?el *">
    Facture N? ! ! ">
    Notes">
    --- 93,134 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAILS COMPTABILITE
    Comptes *
    Quantit? command?e">
    Quantit? re?ue *">
    Frais Remplacement">
    Co?ts budget?s ">
    Co?t effectif *">
    N? facture ! ! ">
    Notes">
    *************** *** 137,141 ****

     

    !
    --- 137,141 ----

     

    !
    *************** *** 144,162 **** Panier ISBN ! TITLE AUTEUR ! Qt? Re?u ! ! ! ! &biblio=&invoice=&freight=&gst=&id=> ! ! ! ! ! --- 144,162 ---- Panier ISBN ! TITRE AUTEUR ! Quantit? Re?u ! ! ! ! &biblio=&invoice=&freight=&gst=&id=> ! ! ! ! ! Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** basket.tmpl 17 Sep 2003 13:34:11 -0000 1.5 --- basket.tmpl 11 Feb 2004 09:00:47 -0000 1.6 *************** *** 1,57 **** ! ! Panier pour >
    ! (R?f?rence: , #, pass?e par : )

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! ! ! --- 1,57 ---- ! !

    Panier pour >


    ! Notre ref: , # valid?e par

    N? cmde Isbn Titre AuteurPx remplPx estQt?RecuTotal
    &id=&basket=">
    AIDE
    ! Pour changer un ?l?ment de cataloguage ou de comptabilit? attach? ? une commande, cliquer sur le titre
    		Sous-Total>
    TVA>
    TOTAL>
    ! "> ! "> ! Ajouter commande : entrer mot clef ou titre de notice
    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! ! ! *************** *** 61,63 **** ! --- 61,63 ---- ! Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** newbasket2.tmpl 17 Sep 2003 13:34:11 -0000 1.4 --- newbasket2.tmpl 11 Feb 2004 09:00:47 -0000 1.5 *************** *** 1,76 **** ! !

    Panier pour:

    ! ! &basket=&sub="> ! //images/filenew.png" align=right alt="Ajouter Notice" border=0> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter Notice"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Voir Panier">
    ! > ! > ! Nouvelle Recherche:
    ! Votre recherche: ! ! !
    ! résultats. !
    Affichage des résultats à . !
    Commande Editeur Isbn Titre Auteur$ rrp$estQuantit? Total
    &id=&basket=">
    AIDE
    ! Pour changer n'importe quelle information attach?e ? cette commande, cliquez sur le titre.
    		Sous-total
    GST
    TOTAL
    ! "> ! "> ! Ajouter une commande : entrez un mot-cl? ou un titre:
    "> ! /images/background-mem.gif"> ! ! ! ! "> ! !
    TITRE AUTEURANNEENOMBRE LOCALISATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! &type="> ! ! ! !
      --- 1,76 ---- ! !

    Panier pour:

    ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter New Biblio"> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Ajouter New Biblio"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Voir Panier">
    ! > ! > ! Nouvelle recherche:

    ! Recherche effectu?e sur ! ! !
    ! R?sultats trouv?s. !
    R?sultats to affich?. ! ! ! ! ! ! "> ! !
    TITRE AUTEUR©COMPTE LOCALISATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! &type="> ! ! ! !
      *************** *** 91,100 ****
    ! ! &offset=&type=&id=&basket=&search=&author="> Next !
    ! --- 91,100 ----
    ! ! &offset=&type=&id=&basket=&search=&author="> Next !

    ! Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** newbasket.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- newbasket.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,14 **** ! ! Panier for
    ! (R?f?rence: , #, pass?e par : )
    ! Tel: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Chercher mot-clef ou titre:
    --- 1,14 ---- ! !

    Panier for


    ! (Notre ref: , #, valid?e par: )
    ! T?l.: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Rechercher Mot-cl? ou Titre:
    *************** *** 16,36 **** ! ! ! ! > ! ! ! ! ! !
    N? cmde Isbn Titre AuteurQt?
    ! --- 16,36 ---- ! ! ! ! > ! ! ! ! ! !
    Commande Isbn Titre AuteurQuantit?
    ! Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** newbiblio.tmpl 17 Sep 2003 13:34:11 -0000 1.5 --- newbiblio.tmpl 11 Feb 2004 09:00:47 -0000 1.6 *************** *** 1,7 **** !
    ! ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! !
    ! - D?tail commande
    ! Panier pour : !     		! "> ! //images/1uparrow.png" border=0 alt="View Basket"> ! !

    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAIL CATALOGUE
    Titre *">
    Auteur" >
    Date copyright">
    Cat?gorie
    ISBN">
    P?riodiques">
    Site
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! ! ! --- 51,143 ---- ! ! --> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Voir Panier !

    - Commande Details


    ! Panier pour:

    /images/background-mem.gif" colspan=2>DETAILS FINANCIERS
    Quantit?" onchange='update(this.form)' >
    Fonds
    Prix fournisseur" onchange='update(this.form)'>
    Co?t remplacement
    		" onchange='update(this.form)'>
    Cout budg?t?
    		" onchange='update(this.form)'>
    Taxes
    TOTAL BUDGETE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>DETAILS CATALOGUE
    Titre *">
    Auteur" >
    Editeur" >
    Date Copyright">
    Format
    ISBN">
    S?ries">
    Annexe
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 153,160 **** ! !
    /images/background-mem.gif" colspan=2>DETAILS COMPTABILITE
    Quantit?" onchange='mettre ? jour(this.form)' >
    Comptes
    Prix catalogue du fournisseur" onchange='mettre ? jour(this.form)'>
    Frais Remplacement
    		" onchange='mettre ? jour(this.form)'>
    Co?ts budget?s
    (ex TVA, remise)     		" onchange='mettre ? jour(this.form)'>
    GST budget?
    TOTAL BUDGETE
    Notes">
    //images/2rightarrow.png" border=0 align=right>
    --- 150,158 ---- Notes ! "> ! ! *************** *** 162,173 ****
    !
    /images/background-mem.gif">HELP
      !
    • les champs en GRAS doivent ?tre remplis pour cr?er une nouvelle notice et un exemplaire
      • !
    • Les champs en italique peuvent ?tre utilis?s pour faire une "r?ception rapide" lorsque les exemplaires seront r?ceptionn?s

     

    ! --- 160,171 ----
    !
    /images/background-mem.gif">AIDE
      !
    • Les champs en gras sont obligatoires.

      !

    • Les champs ombr?s peuvent ?tre utilis?s pour effectuer un retour "rapide", quand les ouvrages ont ?t? achet? localement ou re?us en don. Dans ce cas, la quantit? "command?e" sera aussi affect?e dans la base de donn?es ? la quantit? "re?ue".

     

    ! Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/order.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** order.tmpl 17 Sep 2003 13:34:11 -0000 1.3 --- order.tmpl 11 Feb 2004 09:00:47 -0000 1.4 *************** *** 1,17 **** ! ! Recherche fournisseur
    ! vous avez cherch? le fournisseur , r?ponses trouv?es

    ! ! ! ! ! ! ! ! ! !
    N? cmdeLivraisonfournisseur ! ! --- 1,17 ---- ! !

    R?sultats de recherche fournisseur


    ! Recherche effectu?e sur Fournisseur , R?sultats trouv?s

    PanierExemplaireSaisi par Date
    ! ! ! ! ! > ! !
    CommandeRecevoirEntreprise ! ! *************** *** 20,52 **** ! ! > ! ! ! !
    PanierOuvragesEquipe Date
    ! ">/images/mail_send.png" title="Passer commande" ALT="Add" BORDER=0 > ! ">/images/mail_get.png" title="Livraison" ALT="Add" BORDER=0 > "> ! ! ! ! !
    ">
    -

    ! Ajouter fournisseur !

    !
    ! --- 20,52 ----
    ! ! /images/mail_send.png" title="Ajouter order" ALT="Add" BORDER=0 > ! ! Inactif ! ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > ! ! ! ! !
    ">
    !
    ! Ajouter un fournisseur ! Index: recieveorder.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieveorder.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** recieveorder.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- recieveorder.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,29 **** ! ! R?ceptionner commande du fournisseur

    ! >

    ! ! ! ! ! --- 1,29 ---- ! !

    R?ceptionner commandes d'un fournisseur ">

    ! >

    INFORMATIONS DE FACTURE FOURNISSEUR
    N? commande fournisseur
    gst
    Port
    /images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
    ! ! ! ! ! *************** *** 31,33 **** ! --- 31,33 ---- ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** recieve.tmpl 4 Apr 2003 08:29:43 -0000 1.1 --- recieve.tmpl 11 Feb 2004 09:00:47 -0000 1.2 *************** *** 1,19 **** !
    ! Facture :
    ! R?ceptionn?e par :
    !
    ! R?ception pour : , Facture
    ! "> ! "> ! "> ! "> ! Rechercher ISBN or Titre:

    --- 1,19 ---- !

    ! Facture:
    ! Re?u par:
    !
    !

    Sommaire pour : Facture

    ! "> ! "> ! "> ! "> ! Rechercher ISBN ou Titre:

    *************** *** 27,47 ****

    ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    INFORMATION FACTURE FOURNISSEUR
    N? de facture de fournisseur
    GST
    Fret
    AUTEUR ACTUELPortQTE TOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    --- 27,47 ----     		AUTEUR ACTUELP&PQUANTITE TOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    *************** *** 52,73 ****     		SUBTOTALS$$
    AIDE !
    Le total en bas de la page doit ?tre le m?me que sur la facture ? quelques cents pr?s.

    ! Quand vous avez termin?, enregistrez les modifications     		GST?
    TOTAL?
    --- 52,74 ----

    		SOUS-TOTAUX$$
    AIDE !
    ! Le total au fond de la page devrait correspondre ? quelques centimes au total de la facture.

    ! Quand vous avez fini cette facture, sauvegardez les changements.

    		GST$
    TOTAL$
    Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** supplier.tmpl 17 Sep 2003 13:34:11 -0000 1.4 --- supplier.tmpl 11 Feb 2004 09:00:47 -0000 1.5 *************** *** 1,159 **** !

    ! > ! Modification :

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - - -
    DETAIL FOURNISSEUR
    Nom fournisseur">
    Adresse !
    Adresse si?ge
    Tel">
    Fax">
    site web">
    CONTACT
    Nom">
    fonction">
    Tel">
    Autre tel">
    Fax">
    E-mail">
    Notes
    ! ! ! ! ! ! ! ! ! ! ! !
    STATUT
    Le fournisseur estchecked>Actif ! checked>Inactif
    INFORMATIONS COMMANDE
    Publications
    Les prix sont en
    Les factures sont en
    GST ! checked>Oui ! checked>Non
    Prix incluent la TVA ! checked>Oui ! checked>Non
    Le prix des factures incluent la TVA ! checked>Oui ! checked>Non
    remise> %
    !
    ! --- 1,164 ---- !
    ! > ! ! !

    Mettre ? jour:

    ! !

    Ajouter un fournisseur

    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DETAILS ENTREPRISE
    Nom Entreprise">
    Adresse postale !
    Adresse physique
    T?l?phone">
    Fax">
    Site Web">
    DETAILS CONTACT
    Nom du contact">
    Position">
    T?l?phone">
    Autre t?l?phone">
    Fax">
    E-mail">
    Notes
    ! ! ! ! Actif ! Inactif ! ! ! ! ! ! ! ! ! ! !
    STATUT ACTUEL
    Le fournisseur est ! ! Actif ! Inactif
    INFORMATION COMMANDES
    Edition
    Prix catalogue sont
    Prix factur?s sont
    GST enregistr? ! checked>Oui ! checked>Non
    Prix catalogue de l'ouvrage inclus le GST ! checked>Oui ! checked>Non
    Prix de la facture de l'ouvrage inclus le GST ! checked>Oui ! checked>Non
    Rabais> %
    !
    !
    /images/filesave.png" border=0 title="Enregistrer" alt="Enregistrer" class="button">
    ! From acli at users.sourceforge.net Mon Feb 16 23:50:52 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 14:50:52 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator text-extract2.pl,1.32,1.33 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25717 Modified Files: text-extract2.pl Log Message: Minor factoring of construction of warning messages. Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** text-extract2.pl 14 Feb 2004 09:50:11 -0000 1.32 --- text-extract2.pl 16 Feb 2004 22:50:34 -0000 1.33 *************** *** 81,89 **** ############################################################################### ! sub warn_pedantic ($$) { ! my($flag, $msg) = @_; ! warn "Warning$pedantic_tag: $msg\n" if $pedantic_p || !$$flag; if (!$pedantic_p) { ! warn "Warning$pedantic_tag: Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; $$flag = 1; } --- 81,113 ---- ############################################################################### ! use vars qw( $appName $input_abbr ); ! ! sub construct_warn_prefix ($$) { ! my($prefix, $lc) = @_; ! # Construct some short but should-be-still-useful versions ! # of this script's name and the input file's name ! my $appName = $& if !defined $appName && $0 =~ /[^\/]+$/; ! my $input_abbr = $& if !defined $input_abbr && $input =~ /[^\/]+$/; ! # FIXME: The line number is not accurate, but should be "close enough" ! # FIXME: This wording is worse than what was there, but it's wrong to ! # FIXME: hard-code this thing in each warn statement. Need improvement. ! return "$appName: $prefix: " . (defined $lc? "$input_abbr: line $lc: ": "$input_abbr: "); ! } ! ! sub warn_normal ($$) { ! my($msg, $lc) = @_; ! my $prefix = construct_warn_prefix('Warning', $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg"; ! } ! ! sub warn_pedantic ($$$) { ! my($msg, $lc, $flag) = @_; ! my $prefix = construct_warn_prefix("Warning$pedantic_tag", $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg" if $pedantic_p || !$$flag; if (!$pedantic_p) { ! $prefix = construct_warn_prefix("Warning$pedantic_tag", undef); ! warn $prefix."Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; $$flag = 1; } *************** *** 105,110 **** $s = $rest; if ($val =~ /$re_tmpl_include/os) { ! warn "Warning: TMPL_INCLUDE in attribute" ! . (defined $lc? " near line $lc": '') . ": $val_orig\n"; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc --- 129,133 ---- $s = $rest; if ($val =~ /$re_tmpl_include/os) { ! warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc *************** *** 112,124 **** my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic \$pedantic_tmpl_var_use_in_nonpedantic_mode_p, "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . (defined $lc? " near line $lc": '') . ": $val_orig" if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic \$pedantic_attribute_error_in_nonpedantic_mode_p, "Unquoted attribute contains character(s) that should be quoted" ! . (defined $lc? " near line $lc": '') . ": $val_orig" if $t =~ /[^-\.A-Za-z0-9]/s; } --- 135,149 ---- my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . ": $val_orig", ! $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic "Unquoted attribute contains character(s) that should be quoted" ! . ": $val_orig", ! $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p if $t =~ /[^-\.A-Za-z0-9]/s; } *************** *** 127,137 **** if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! warn "Error: Completely confused while extracting attributes" ! . (defined $lc? " near line $lc": '') . ": $1\n"; ! warn "Error: " . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; $fatal_p = 1; } else { ! warn "Warning: Strange attribute syntax" ! . (defined $lc? " near line $lc": '') . ": $s\n"; } } --- 152,162 ---- if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! my $prefix = construct_warn_prefix('Error: ', $lc); ! warn $prefix . "Completely confused while extracting attributes" ! . ": $1\n"; ! warn $prefix . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; $fatal_p = 1; } else { ! warn "Strange attribute syntax: $s\n", $lc; } } *************** *** 159,163 **** } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn "Warning: Unescaped < near line $lc_0: $it\n" if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; ! warn "Warning: SGML \"closed start tag\" notation near line $lc_0: $1<\n" if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; ! warn "Warning: Syntax error in comment at line $lc_0: $&\n"; $syntaxerror_p = 1; } --- 200,208 ---- ($kind, $it, $readahead) = (KIND_TAG, "$1>", $3); $ok_p = 1; ! warn "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; ! warn "Syntax error in comment: $&\n", $lc_0; $syntaxerror_p = 1; } *************** *** 205,209 **** } } ! warn "Warning: Unrecognizable token found near line $lc_0: $it\n" if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): --- 230,234 ---- } } ! warn "Unrecognizable token found: $it\n", $lc_0 if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): *************** *** 352,356 **** } ! warn "Warning: This input will not work with Mozilla standards-compliant mode\n" if $syntaxerror_p; --- 377,381 ---- } ! warn "This input will not work with Mozilla standards-compliant mode\n", undef if $syntaxerror_p; From acli at users.sourceforge.net Tue Feb 17 00:42:59 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:42:59 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,NONE,1.1 VerboseWarnings.pm,NONE,1.1 text-extract2.pl,1.33,1.34 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4517 Modified Files: text-extract2.pl Added Files: TmplTokenizer.pm VerboseWarnings.pm Log Message: Pulled the tokenizer out into a module. Hope this has been done right. --- NEW FILE --- package TmplTokenizer; use strict; use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic ); require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplTokenizer.pm - Simple-minded tokenizer for HTML::Template .tmpl files =head1 DESCRIPTION Because .tmpl files contains HTML::Template directives that tend to confuse real parsers (e.g., HTML::Parse), it might be better to create a customized scanner to scan the template files for tokens. This module is a simple-minded attempt at such a scanner. =head1 HISTORY This tokenizer is mostly based on Ambrose's hideous Perl script known as subst.pl. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw( &KIND_TEXT &KIND_CDATA &KIND_TAG &KIND_DECL &KIND_PI &KIND_DIRECTIVE &KIND_COMMENT &KIND_UNKNOWN ); use vars qw( $input ); use vars qw( $debug_dump_only_p ); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); use vars qw( $fatal_p ); ############################################################################### # Hideous stuff use vars qw( $re_directive $re_tmpl_var $re_tmpl_var_escaped $re_tmpl_include ); use vars qw( $re_directive_control $re_tmpl_endif_endloop ); BEGIN { # $re_directive must not do any backreferences $re_directive = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:VAR|LOOP|INCLUDE|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # TMPL_VAR or TMPL_INCLUDE $re_tmpl_var = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; $re_tmpl_include = q{<(?:(?i)(?:!--\s*)?TMPL_(?:INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # TMPL_VAR ESCAPE=1/HTML/URL $re_tmpl_var_escaped = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR|INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))\s+ESCAPE=(?:1|HTML|URL)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # Any control flow directive $re_directive_control = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:LOOP|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; # /LOOP or /IF or /UNLESS $re_tmpl_endif_endloop = q{<(?:(?i)(?:!--\s*)?\/TMPL_(?:LOOP|IF|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; } # Hideous stuff from subst.pl, slightly modified to use the above hideous stuff # Note: The $re_tag's set $1 (), and $3 (rest of string) use vars qw( $re_comment $re_entity_name $re_end_entity $re_etag ); use vars qw( $re_tag_strict $re_tag_compat @re_tag ); sub re_tag ($) { my($compat) = @_; my $etag = $compat? '>': '<>\/'; # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; } BEGIN { $re_comment = '(?:--(?:[^-]|-[^-])*--)'; $re_entity_name = '(?:[^&%#;<>\s]+)'; # NOTE: not really correct SGML $re_end_entity = '(?:;|$|(?=\s))'; # semicolon or before-whitespace $re_etag = q{(?:<\/?(?:"[^"]*"|'[^']*'|[^"'>\/])*[>\/])}; # end-tag @re_tag = ($re_tag_strict, $re_tag_compat) = (re_tag(0), re_tag(1)); } # End of the hideous stuff sub KIND_TEXT () { 'TEXT' } sub KIND_CDATA () { 'CDATA' } sub KIND_TAG () { 'TAG' } sub KIND_DECL () { 'DECL' } sub KIND_PI () { 'PI' } sub KIND_DIRECTIVE () { 'HTML::Template' } sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment sub KIND_UNKNOWN () { 'ERROR' } use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); ############################################################################### # Easy accessors sub fatal_p () { return $fatal_p; } sub syntaxerror_p () { return $syntaxerror_p; } ############################################################################### sub extract_attributes ($;$) { my($s, $lc) = @_; my %attr; $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { my($key, $val, $val_orig, $rest) = ($1, (defined $3? $3: defined $4? $4: $5), $2, $'); $i += 1; $attr{+lc($key)} = [$key, $val, $val_orig, $i]; $s = $rest; if ($val =~ /$re_tmpl_include/os) { warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { # XXX: we probably should not warn if key is "onclick" etc # XXX: there's just no reasonable thing to suggest my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; warn_pedantic "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" . ": $val_orig", $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p if defined $suggest && (pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); } elsif ($val_orig !~ /^['"]/) { my $t = $val; $t =~ s/$re_directive_control//os; warn_pedantic "Unquoted attribute contains character(s) that should be quoted" . ": $val_orig", $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p if $t =~ /[^-\.A-Za-z0-9]/s; } } my $s2 = $s; $s2 =~ s/$re_tmpl_endif_endloop//g; # for the next check if ($s2 =~ /\S/s) { # should never happen if ($s =~ /^([^\n]*)\n/s) { # this is even worse error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); $fatal_p = 1; } else { warn_normal "Strange attribute syntax: $s\n", $lc; } } return \%attr; } sub next_token_internal (*) { my($h) = @_; my($it, $kind); my $eof_p = 0; if (!defined $readahead || !length $readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; $readahead .= $next; } } $lc_0 = $lc; # remember line number of first line if ($eof_p && !length $readahead) { # nothing left to do ; } elsif ($readahead =~ /^\s+/s) { # whitespace ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); warn_normal "Warning: Unescaped < $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; $syntaxerror_p = 1; } last if $ok_p; my $next = scalar <$h>; $eof_p = !defined $next; last if $eof_p; $lc += 1; $readahead .= $next; } if ($kind ne KIND_TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { $kind = KIND_PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { $kind = KIND_DIRECTIVE; } if (!$ok_p && $eof_p) { ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 if $kind eq KIND_UNKNOWN; return defined $it? (wantarray? ($kind, $it): [$kind, $it]): undef; } sub next_token (*) { my($h) = @_; my $it; if (!$cdata_mode_p) { $it = next_token_internal($h); if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ($cdata_mode_p, $cdata_close) = (1, "") if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME push @$it, extract_attributes($it->[1], $lc_0); #FIXME } } else { for ($it = '';;) { my $lc_prev = $lc; my $next = next_token_internal($h); last if !defined $next; if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME $cdata_mode_p = 0; } last unless $cdata_mode_p; $it .= $next->[1]; #FIXME } $it = [KIND_CDATA, $it]; #FIXME $cdata_close = undef; } return defined $it? (wantarray? @$it: $it): undef; } ############################################################################### sub debug_dump (*) { # for testing only my($h) = @_; print "re_tag_compat is /$re_tag_compat/\n"; for (;;) { my $s = next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); my($kind, $t, $attr) = @$s; # FIXME printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); if ($kind eq KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { my($key, $val, $val_orig, $order) = @{$attr->{$a}}; printf "%s = %dH%s -- %s\n", $a, length $val, join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $val)), $val_orig; } } } } ############################################################################### sub trim ($) { my($s) = @_; $s =~ s/^(?:\s|\ $re_end_entity)+//os; $s =~ s/(?:\s|\ $re_end_entity)+$//os; return $s; } ############################################################################### sub text_extract (*) { my($h) = @_; my %text = (); for (;;) { my $s = next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME if ($kind eq KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; } elsif ($kind eq KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = trim $val; $text{$val} = 1 if $val =~ /\S/s; } } } } # Emit all extracted strings. # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (keys %text) { printf "%s\n", $t unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; } } ############################################################################### sub usage ($) { my($exitcode) = @_; my $h = $exitcode? *STDERR: *STDOUT; print $h <]+))*\s*(?:--)?)>}; ! # TMPL_VAR or TMPL_INCLUDE ! $re_tmpl_var = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! $re_tmpl_include = q{<(?:(?i)(?:!--\s*)?TMPL_(?:INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # TMPL_VAR ESCAPE=1/HTML/URL ! $re_tmpl_var_escaped = q{<(?:(?i)(?:!--\s*)?TMPL_(?:VAR|INCLUDE)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))\s+ESCAPE=(?:1|HTML|URL)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # Any control flow directive ! $re_directive_control = q{<(?:(?i)(?:!--\s*)?\/?TMPL_(?:LOOP|IF|ELSE|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! # /LOOP or /IF or /UNLESS ! $re_tmpl_endif_endloop = q{<(?:(?i)(?:!--\s*)?\/TMPL_(?:LOOP|IF|UNLESS)(?:\s+(?:[a-zA-Z][-a-zA-Z0-9]*=)?(?:'[^']*'|"[^"]*"|[^\s<>]+))*\s*(?:--)?)>}; ! } ! ! # Hideous stuff from subst.pl, slightly modified to use the above hideous stuff ! # Note: The $re_tag's set $1 (), and $3 (rest of string) ! use vars qw( $re_comment $re_entity_name $re_end_entity $re_etag ); ! use vars qw( $re_tag_strict $re_tag_compat @re_tag ); ! sub re_tag ($) { ! my($compat) = @_; ! my $etag = $compat? '>': '<>\/'; ! # This is no longer similar to the original regexp in subst.pl :-( ! # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} ! . $re_directive ! . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; ! } ! BEGIN { ! $re_comment = '(?:--(?:[^-]|-[^-])*--)'; ! $re_entity_name = '(?:[^&%#;<>\s]+)'; # NOTE: not really correct SGML ! $re_end_entity = '(?:;|$|(?=\s))'; # semicolon or before-whitespace ! $re_etag = q{(?:<\/?(?:"[^"]*"|'[^']*'|[^"'>\/])*[>\/])}; # end-tag ! @re_tag = ($re_tag_strict, $re_tag_compat) = (re_tag(0), re_tag(1)); ! } ! ! # End of the hideous stuff ! ! sub KIND_TEXT () { 'TEXT' } ! sub KIND_CDATA () { 'CDATA' } ! sub KIND_TAG () { 'TAG' } ! sub KIND_DECL () { 'DECL' } ! sub KIND_PI () { 'PI' } ! sub KIND_DIRECTIVE () { 'HTML::Template' } ! sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment ! sub KIND_UNKNOWN () { 'ERROR' } ! ! use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); ! use vars qw( $cdata_mode_p $cdata_close ); ! ! ############################################################################### ! ! use vars qw( $appName $input_abbr ); ! ! sub construct_warn_prefix ($$) { ! my($prefix, $lc) = @_; ! # Construct some short but should-be-still-useful versions ! # of this script's name and the input file's name ! my $appName = $& if !defined $appName && $0 =~ /[^\/]+$/; ! my $input_abbr = $& if !defined $input_abbr && $input =~ /[^\/]+$/; ! # FIXME: The line number is not accurate, but should be "close enough" ! # FIXME: This wording is worse than what was there, but it's wrong to ! # FIXME: hard-code this thing in each warn statement. Need improvement. ! return "$appName: $prefix: " . (defined $lc? "$input_abbr: line $lc: ": "$input_abbr: "); ! } ! ! sub warn_normal ($$) { ! my($msg, $lc) = @_; ! my $prefix = construct_warn_prefix('Warning', $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg"; ! } ! ! sub warn_pedantic ($$$) { ! my($msg, $lc, $flag) = @_; ! my $prefix = construct_warn_prefix("Warning$pedantic_tag", $lc); ! $msg .= "\n" unless $msg =~ /\n$/s; ! warn "$prefix$msg" if $pedantic_p || !$$flag; ! if (!$pedantic_p) { ! $prefix = construct_warn_prefix("Warning$pedantic_tag", undef); ! warn $prefix."Further similar negligible warnings will not be reported, use --pedantic for details\n" unless $$flag; ! $$flag = 1; ! } ! } ! ! ############################################################################### ! ! sub extract_attributes ($;$) { ! my($s, $lc) = @_; ! my %attr; ! $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags ! ! for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { ! my($key, $val, $val_orig, $rest) ! = ($1, (defined $3? $3: defined $4? $4: $5), $2, $'); ! $i += 1; ! $attr{+lc($key)} = [$key, $val, $val_orig, $i]; ! $s = $rest; ! if ($val =~ /$re_tmpl_include/os) { ! warn_normal "TMPL_INCLUDE in attribute: $val_orig\n", $lc; ! } elsif ($val =~ /$re_tmpl_var/os && $val !~ /$re_tmpl_var_escaped/os) { ! # XXX: we probably should not warn if key is "onclick" etc ! # XXX: there's just no reasonable thing to suggest ! my $suggest = ($key =~ /^(?:action|archive|background|cite|classid|codebase|data|datasrc|for|href|longdesc|profile|src|usemap)$/i? 'URL': 'HTML'); ! undef $suggest if $key =~ /^(?:onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onselect|onsubmit|onunload)$/i; ! warn_pedantic ! "Suggest ESCAPE=$suggest for TMPL_VAR in attribute \"$key\"" ! . ": $val_orig", ! $lc, \$pedantic_tmpl_var_use_in_nonpedantic_mode_p ! if defined $suggest && ($pedantic_p || !$pedantic_tmpl_var_use_in_nonpedantic_mode_p); ! } elsif ($val_orig !~ /^['"]/) { ! my $t = $val; $t =~ s/$re_directive_control//os; ! warn_pedantic ! "Unquoted attribute contains character(s) that should be quoted" ! . ": $val_orig", ! $lc, \$pedantic_attribute_error_in_nonpedantic_mode_p ! if $t =~ /[^-\.A-Za-z0-9]/s; ! } ! } ! my $s2 = $s; $s2 =~ s/$re_tmpl_endif_endloop//g; # for the next check ! if ($s2 =~ /\S/s) { # should never happen ! if ($s =~ /^([^\n]*)\n/s) { # this is even worse ! my $prefix = construct_warn_prefix('Error: ', $lc); ! warn $prefix . "Completely confused while extracting attributes" ! . ": $1\n"; ! warn $prefix . (scalar split(/\n/, $s) - 1) . " more line(s) not shown.\n"; ! $fatal_p = 1; ! } else { ! warn "Strange attribute syntax: $s\n", $lc; ! } ! } ! return \%attr; ! } ! ! sub next_token_internal (*) { ! my($h) = @_; ! my($it, $kind); ! my $eof_p = 0; ! if (!defined $readahead || !length $readahead) { ! my $next = scalar <$h>; ! $eof_p = !defined $next; ! if (!$eof_p) { ! $lc += 1; ! $readahead .= $next; ! } ! } ! $lc_0 = $lc; # remember line number of first line ! if ($eof_p && !length $readahead) { # nothing left to do ! ; ! } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn "Warning: Unescaped < $it\n", $lc_0 ! if !$cdata_mode_p && $it =~ /", $3); ! $ok_p = 1; ! warn "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); ! $ok_p = 1; ! warn "Syntax error in comment: $&\n", $lc_0; ! $syntaxerror_p = 1; ! } ! last if $ok_p; ! my $next = scalar <$h>; ! $eof_p = !defined $next; ! last if $eof_p; ! $lc += 1; ! $readahead .= $next; ! } ! if ($kind ne KIND_TAG) { ! ; ! } elsif ($it =~ /^).)*-->/; ! } elsif ($it =~ /^<\?/) { ! $kind = KIND_PI; ! } ! if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = KIND_DIRECTIVE; ! } ! if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); ! $syntaxerror_p = 1; ! } ! } ! warn "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq KIND_UNKNOWN; ! return defined $it? (wantarray? ($kind, $it): ! [$kind, $it]): undef; ! } ! ! sub next_token (*) { ! my($h) = @_; ! my $it; ! if (!$cdata_mode_p) { ! $it = next_token_internal($h); ! if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ! ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME ! push @$it, extract_attributes($it->[1], $lc_0); #FIXME ! } ! } else { ! for ($it = '';;) { ! my $lc_prev = $lc; ! my $next = next_token_internal($h); ! last if !defined $next; ! if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ! ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME ! $cdata_mode_p = 0; ! } ! last unless $cdata_mode_p; ! $it .= $next->[1]; #FIXME ! } ! $it = [KIND_CDATA, $it]; #FIXME ! $cdata_close = undef; ! } ! return defined $it? (wantarray? @$it: $it): undef; ! } ############################################################################### --- 16,26 ---- use Getopt::Long; + use TmplTokenizer; + use VerboseWarnings; use strict; use vars qw( $input ); use vars qw( $debug_dump_only_p ); ! use vars qw( $pedantic_p ); ############################################################################### *************** *** 268,274 **** sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$re_tag_compat/\n"; for (;;) { ! my $s = next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); --- 28,34 ---- sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$TmplTokenizer::re_tag_compat/\n"; for (;;) { ! my $s = TmplTokenizer::next_token $h; last unless defined $s; printf "%s\n", ('-' x 79); *************** *** 277,281 **** printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { --- 37,41 ---- printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenizer::KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { *************** *** 293,298 **** sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $re_end_entity)+//os; ! $s =~ s/(?:\s|\ $re_end_entity)+$//os; return $s; } --- 53,58 ---- sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $TmplTokenizer::re_end_entity)+//os; ! $s =~ s/(?:\s|\ $TmplTokenizer::re_end_entity)+$//os; return $s; } *************** *** 304,314 **** my %text = (); for (;;) { ! my $s = next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; --- 64,74 ---- my %text = (); for (;;) { ! my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq TmplTokenizer::KIND_TEXT) { $t = trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenizer::KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; *************** *** 329,333 **** for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; } } --- 89,93 ---- for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $TmplTokenizer::re_end_entity|$TmplTokenizer::re_tmpl_var)*$/os || $t =~ /^\d+$/; } } *************** *** 367,371 **** 'help' => sub { usage(0) }, ) || usage_error; ! $pedantic_tag = $pedantic_p? '': ' (negligible)'; usage_error('Missing mandatory option -f') unless defined $input; --- 127,135 ---- 'help' => sub { usage(0) }, ) || usage_error; ! ! VerboseWarnings::set_application_name $0; ! VerboseWarnings::set_input_file_name $input; ! VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') unless defined $input; *************** *** 378,384 **** warn "This input will not work with Mozilla standards-compliant mode\n", undef ! if $syntaxerror_p; close INPUT; ! exit(-1) if $fatal_p; --- 142,148 ---- warn "This input will not work with Mozilla standards-compliant mode\n", undef ! if TmplTokenizer::syntaxerror_p; close INPUT; ! exit(-1) if TmplTokenizer::fatal_p; From acli at users.sourceforge.net Tue Feb 17 00:46:38 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:46:38 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.1,1.2 text-extract2.pl,1.34,1.35 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5197 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Some functions should not be in the module; these are now removed. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplTokenizer.pm 16 Feb 2004 23:42:57 -0000 1.1 --- TmplTokenizer.pm 16 Feb 2004 23:46:34 -0000 1.2 *************** *** 266,294 **** ############################################################################### - sub debug_dump (*) { # for testing only - my($h) = @_; - print "re_tag_compat is /$re_tag_compat/\n"; - for (;;) { - my $s = next_token $h; - last unless defined $s; - printf "%s\n", ('-' x 79); - my($kind, $t, $attr) = @$s; # FIXME - printf "%s:\n", $kind; - printf "%4dH%s\n", length($t), - join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); - if ($kind eq KIND_TAG && %$attr) { - printf "Attributes:\n"; - for my $a (keys %$attr) { - my($key, $val, $val_orig, $order) = @{$attr->{$a}}; - printf "%s = %dH%s -- %s\n", $a, length $val, - join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $val)), - $val_orig; - } - } - } - } - - ############################################################################### - sub trim ($) { my($s) = @_; --- 266,269 ---- *************** *** 300,364 **** ############################################################################### - sub text_extract (*) { - my($h) = @_; - my %text = (); - for (;;) { - my $s = next_token $h; - last unless defined $s; - my($kind, $t, $attr) = @$s; # FIXME - if ($kind eq KIND_TEXT) { - $t = trim $t; - $text{$t} = 1 if $t =~ /\S/s; - } elsif ($kind eq KIND_TAG && %$attr) { - # value [tag=input], meta - my $tag = lc($1) if $t =~ /^<(\S+)/s; - for my $a ('alt', 'content', 'title', 'value') { - if ($attr->{$a}) { - next if $a eq 'content' && $tag ne 'meta'; - next if $a eq 'value' && ($tag ne 'input' - || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME - my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME - $val = trim $val; - $text{$val} = 1 if $val =~ /\S/s; - } - } - } - } - # Emit all extracted strings. - # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. - for my $t (keys %text) { - printf "%s\n", $t - unless $t =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os || $t =~ /^\d+$/; - } - } - - ############################################################################### - - sub usage ($) { - my($exitcode) = @_; - my $h = $exitcode? *STDERR: *STDOUT; - print $h <{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME ! $val = trim $val; $text{$val} = 1 if $val =~ /\S/s; } --- 70,74 ---- || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME ! $val = TmplTokenizer::trim $val; $text{$val} = 1 if $val =~ /\S/s; } From acli at users.sourceforge.net Tue Feb 17 00:50:58 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 15:50:58 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.2,1.3 text-extract2.pl,1.35,1.36 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6213 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Avoid direct accessing of variables inside the module Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplTokenizer.pm 16 Feb 2004 23:46:34 -0000 1.2 --- TmplTokenizer.pm 16 Feb 2004 23:50:56 -0000 1.3 *************** *** 266,269 **** --- 266,276 ---- ############################################################################### + # Other easy functions + + sub blank_p ($) { + my($s) = @_; + return $s =~ /^(?:\s|\ $re_end_entity|$re_tmpl_var)*$/os; + } + sub trim ($) { my($s) = @_; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** text-extract2.pl 16 Feb 2004 23:46:34 -0000 1.35 --- text-extract2.pl 16 Feb 2004 23:50:56 -0000 1.36 *************** *** 28,32 **** sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /$TmplTokenizer::re_tag_compat/\n"; for (;;) { my $s = TmplTokenizer::next_token $h; --- 28,32 ---- sub debug_dump (*) { # for testing only my($h) = @_; ! print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; for (;;) { my $s = TmplTokenizer::next_token $h; *************** *** 80,84 **** for my $t (keys %text) { printf "%s\n", $t ! unless $t =~ /^(?:\s|\ $TmplTokenizer::re_end_entity|$TmplTokenizer::re_tmpl_var)*$/os || $t =~ /^\d+$/; } } --- 80,84 ---- for my $t (keys %text) { printf "%s\n", $t ! unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } From acli at users.sourceforge.net Tue Feb 17 03:45:30 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 18:45:30 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplToken.pm,NONE,1.1 TmplTokenType.pm,NONE,1.1 TmplTokenizer.pm,1.3,1.4 VerboseWarnings.pm,1.1,1.2 text-extract2.pl,1.36,1.37 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6928 Modified Files: TmplTokenizer.pm VerboseWarnings.pm text-extract2.pl Added Files: TmplToken.pm TmplTokenType.pm Log Message: Further breaking up of the TmplTokenizer module. A couple of minor fixes. --- NEW FILE --- package TmplToken; use strict; use TmplTokenType; require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplToken.pm - Object representing a scanner token for .tmpl files =head1 DESCRIPTION This is a class representing a token scanned from an HTML::Template .tmpl file. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw(); ############################################################################### sub new { my $this = shift; my $class = ref($this) || $this; my $self = {}; bless $self, $class; ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}) = @_; return $self; } sub string { my $this = shift; return $this->{'_string'} } sub type { my $this = shift; return $this->{'_type'} } sub line_number { my $this = shift; return $this->{'_lc'} } sub attributes { my $this = shift; return $this->{'_attr'}; } sub set_attributes { my $this = shift; $this->{'_attr'} = ref $_[0] eq 'HASH'? $_[0]: \@_; return $this; } ############################################################################### 1; --- NEW FILE --- package TmplTokenType; use strict; require Exporter; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); ############################################################################### =head1 NAME TmplTokenType.pm - Types of TmplToken objects =head1 DESCRIPTION This is a Java-style "safe enum" singleton class for types of TmplToken objects. =cut ############################################################################### $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw( &TEXT &CDATA &TAG &DECL &PI &DIRECTIVE &COMMENT &UNKNOWN ); ############################################################################### use vars qw( $_text $_cdata $_tag $_decl $_pi $_directive $_comment $_unknown ); BEGIN { my $new = sub { my $this = shift; my $class = ref($this) || $this; my $self = {}; bless $self, $class; ($self->{'id'}, $self->{'name'}, $self->{'desc'}) = @_; return $self; }; $_text = &$new(0, 'TEXT'); $_cdata = &$new(1, 'CDATA'); $_tag = &$new(2, 'TAG'); $_decl = &$new(3, 'DECL'); $_pi = &$new(4, 'PI'); $_directive = &$new(5, 'DIRECTIVE'); $_comment = &$new(6, 'COMMENT'); $_unknown = &$new(7, 'UNKNOWN'); } sub to_string { my $this = shift; return $this->{'name'} } sub TEXT () { $_text } sub CDATA () { $_cdata } sub TAG () { $_tag } sub DECL () { $_decl } sub PI () { $_pi } sub DIRECTIVE () { $_directive } sub COMMENT () { $_comment } sub UNKNOWN () { $_unknown } ############################################################################### 1; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TmplTokenizer.pm 16 Feb 2004 23:50:56 -0000 1.3 --- TmplTokenizer.pm 17 Feb 2004 02:45:27 -0000 1.4 *************** *** 2,5 **** --- 2,7 ---- use strict; + use TmplTokenType; + use TmplToken; use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic ); require Exporter; *************** *** 33,46 **** @ISA = qw(Exporter); ! @EXPORT_OK = qw( ! &KIND_TEXT ! &KIND_CDATA ! &KIND_TAG ! &KIND_DECL ! &KIND_PI ! &KIND_DIRECTIVE ! &KIND_COMMENT ! &KIND_UNKNOWN ! ); use vars qw( $input ); --- 35,39 ---- @ISA = qw(Exporter); ! @EXPORT_OK = qw(); use vars qw( $input ); *************** *** 92,104 **** # End of the hideous stuff - sub KIND_TEXT () { 'TEXT' } - sub KIND_CDATA () { 'CDATA' } - sub KIND_TAG () { 'TAG' } - sub KIND_DECL () { 'DECL' } - sub KIND_PI () { 'PI' } - sub KIND_DIRECTIVE () { 'HTML::Template' } - sub KIND_COMMENT () { 'COMMENT' } # empty DECL with exactly one SGML comment - sub KIND_UNKNOWN () { 'ERROR' } - use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); --- 85,88 ---- *************** *** 180,188 **** ; } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (KIND_TEXT, $&, $'); ! warn_normal "Warning: Unescaped < $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (KIND_COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; --- 175,190 ---- if ($cdata_mode_p) { if ($readahead =~ /^$cdata_close/) { ! ($kind, $it, $readahead) = (TmplTokenType::TAG, $&, $'); $ok_p = 1; } else { ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $readahead, undef); $ok_p = 1; } } elsif ($readahead =~ /^$re_tag_compat/os) { ! ($kind, $it, $readahead) = (TmplTokenType::TAG, "$1>", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; *************** *** 214,237 **** $readahead .= $next; } ! if ($kind ne KIND_TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { ! $kind = KIND_PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = KIND_DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (KIND_UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq KIND_UNKNOWN; ! return defined $it? (wantarray? ($kind, $it): ! [$kind, $it]): undef; } --- 198,220 ---- $readahead .= $next; } ! if ($kind ne TmplTokenType::TAG) { ; } elsif ($it =~ /^).)*-->/; } elsif ($it =~ /^<\?/) { ! $kind = TmplTokenType::PI; } if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { ! $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (TmplTokenType::UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } } warn_normal "Unrecognizable token found: $it\n", $lc_0 ! if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? TmplToken->new($it, $kind, $lc): undef; } *************** *** 241,248 **** if (!$cdata_mode_p) { $it = next_token_internal($h); ! if (defined $it && $it->[0] eq KIND_TAG) { # FIXME ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->[1] =~ /^<(script|style|textarea)\b/i; #FIXME ! push @$it, extract_attributes($it->[1], $lc_0); #FIXME } } else { --- 224,231 ---- if (!$cdata_mode_p) { $it = next_token_internal($h); ! if (defined $it && $it->type eq TmplTokenType::TAG) { ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->string =~ /^<(script|style|textarea)\b/i; ! $it->set_attributes( extract_attributes($it->string, $lc_0) ); } } else { *************** *** 251,265 **** my $next = next_token_internal($h); last if !defined $next; ! if (defined $next && $next->[1] =~ /$cdata_close/i) { #FIXME ! ($lc, $readahead) = ($lc_prev, $next->[1] . $readahead); #FIXME $cdata_mode_p = 0; } last unless $cdata_mode_p; ! $it .= $next->[1]; #FIXME } ! $it = [KIND_CDATA, $it]; #FIXME $cdata_close = undef; } ! return defined $it? (wantarray? @$it: $it): undef; } --- 234,248 ---- my $next = next_token_internal($h); last if !defined $next; ! if (defined $next && $next->string =~ /$cdata_close/i) { ! ($lc, $readahead) = ($lc_prev, $next->string . $readahead); $cdata_mode_p = 0; } last unless $cdata_mode_p; ! $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $lc ); $cdata_close = undef; } ! return $it; } *************** *** 291,293 **** --- 274,288 ---- rework in tmpl_process.pl + Gettext-style line number references would also be very helpful in + disambiguating the strings. Ultimately, we should generate and work + with gettext-style po files, so that translators are able to use + tools designed for gettext. + + An example of a string untranslatable to Chinese is "Accounts for"; + "Accounts for %s", however, would be translatable. Short words like + "in" would also be untranslatable, not only to Chinese, but also to + languages requiring declension of nouns. + =cut + + 1; Index: VerboseWarnings.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/VerboseWarnings.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** VerboseWarnings.pm 16 Feb 2004 23:42:57 -0000 1.1 --- VerboseWarnings.pm 17 Feb 2004 02:45:27 -0000 1.2 *************** *** 25,31 **** @ISA = qw(Exporter); @EXPORT_OK = qw( - &set_application_name - &set_input_file_name - &set_pedantic_mode &pedantic_p &warn_normal --- 25,28 ---- *************** *** 46,50 **** my($s) = @_; $input = $s; ! $input_abbr = $& if !defined $input && defined $s && $s =~ /[^\/]+$/; } --- 43,47 ---- my($s) = @_; $input = $s; ! $input_abbr = $& if defined $s && $s =~ /[^\/]+$/; } Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** text-extract2.pl 16 Feb 2004 23:50:56 -0000 1.36 --- text-extract2.pl 17 Feb 2004 02:45:27 -0000 1.37 *************** *** 33,41 **** last unless defined $s; printf "%s\n", ('-' x 79); ! my($kind, $t, $attr) = @$s; # FIXME printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenizer::KIND_TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { --- 33,41 ---- last unless defined $s; printf "%s\n", ('-' x 79); ! my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); ! if ($kind eq TmplTokenType::TAG && %$attr) { printf "Attributes:\n"; for my $a (keys %$attr) { *************** *** 57,65 **** my $s = TmplTokenizer::next_token $h; last unless defined $s; ! my($kind, $t, $attr) = @$s; # FIXME ! if ($kind eq TmplTokenizer::KIND_TEXT) { $t = TmplTokenizer::trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenizer::KIND_TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; --- 57,65 ---- my $s = TmplTokenizer::next_token $h; last unless defined $s; ! my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! if ($kind eq TmplTokenType::TEXT) { $t = TmplTokenizer::trim $t; $text{$t} = 1 if $t =~ /\S/s; ! } elsif ($kind eq TmplTokenType::TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; From acli at users.sourceforge.net Tue Feb 17 04:02:41 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 19:02:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenType.pm,1.1,1.2 text-extract2.pl,1.37,1.38 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11024 Modified Files: TmplTokenType.pm text-extract2.pl Log Message: Fixed more bugs during the modularization Index: TmplTokenType.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenType.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplTokenType.pm 17 Feb 2004 02:45:27 -0000 1.1 --- TmplTokenType.pm 17 Feb 2004 03:02:39 -0000 1.2 *************** *** 40,44 **** BEGIN { my $new = sub { ! my $this = shift; my $class = ref($this) || $this; my $self = {}; --- 40,44 ---- BEGIN { my $new = sub { ! my $this = 'TmplTokenType';#shift; my $class = ref($this) || $this; my $self = {}; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** text-extract2.pl 17 Feb 2004 02:45:27 -0000 1.37 --- text-extract2.pl 17 Feb 2004 03:02:39 -0000 1.38 *************** *** 34,38 **** printf "%s\n", ('-' x 79); my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! printf "%s:\n", $kind; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); --- 34,38 ---- printf "%s\n", ('-' x 79); my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); ! printf "%s [line %d]:\n", $kind->to_string, $s->line_number; printf "%4dH%s\n", length($t), join('', map {/[\0-\37]/? $_: "$_\b$_"} split(//, $t)); From acli at users.sourceforge.net Tue Feb 17 04:17:57 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 19:17:57 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13338 Modified Files: TmplTokenizer.pm Log Message: Still more bugfixes for my own bugs. $readahead is now an array @readahead which can contain TmplToken objects, so "ungetting" tokens should not disturb the line number counter any more. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** TmplTokenizer.pm 17 Feb 2004 02:45:27 -0000 1.4 --- TmplTokenizer.pm 17 Feb 2004 03:17:48 -0000 1.5 *************** *** 85,89 **** # End of the hideous stuff ! use vars qw( $readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); --- 85,89 ---- # End of the hideous stuff ! use vars qw( @readahead $lc_0 $lc $syntaxerror_p ); use vars qw( $cdata_mode_p $cdata_close ); *************** *** 152,171 **** my($it, $kind); my $eof_p = 0; ! if (!defined $readahead || !length $readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; ! $readahead .= $next; } } $lc_0 = $lc; # remember line number of first line ! if ($eof_p && !length $readahead) { # nothing left to do ; ! } elsif ($readahead =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead) = (TmplTokenType::TEXT, $&, $'); warn_normal "Unescaped < in $it\n", $lc_0 if !$cdata_mode_p && $it =~ /; $eof_p = !defined $next; if (!$eof_p) { $lc += 1; ! push @readahead, $next; } } $lc_0 = $lc; # remember line number of first line ! if (@readahead && ref $readahead[$#readahead]) { # TmplToken object ! my $t = pop @readahead; ! ($it, $kind, local $lc) = ($t->string, $t->type, $t->line_number); ! } elsif ($eof_p && !@readahead) { # nothing left to do ; ! } elsif ($readahead[$#readahead] =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead[$#readahead] =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); warn_normal "Unescaped < in $it\n", $lc_0 if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead =~ /^).)*-->/s) { ! ($kind, $it, $readahead) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; --- 179,195 ---- for (;;) { if ($cdata_mode_p) { ! if ($readahead[$#readahead] =~ /^$cdata_close/) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TAG, $&, $'); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, pop @readahead); $ok_p = 1; } ! } elsif ($readahead[$#readahead] =~ /^$re_tag_compat/os) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TAG, "$1>", $3); $ok_p = 1; warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead[$#readahead] =~ /^).)*-->/s) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; warn_normal "Syntax error in comment: $&\n", $lc_0; *************** *** 196,200 **** last if $eof_p; $lc += 1; ! $readahead .= $next; } if ($kind ne TmplTokenType::TAG) { --- 201,205 ---- last if $eof_p; $lc += 1; ! $readahead[$#readahead] .= $next; } if ($kind ne TmplTokenType::TAG) { *************** *** 210,214 **** } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead) = (TmplTokenType::UNKNOWN, $readahead, undef); $syntaxerror_p = 1; } --- 215,219 ---- } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::UNKNOWN, $readahead[$#readahead], undef); $syntaxerror_p = 1; } *************** *** 235,239 **** last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! ($lc, $readahead) = ($lc_prev, $next->string . $readahead); $cdata_mode_p = 0; } --- 240,245 ---- last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! push @readahead, $next; # push the entire TmplToken object ! #$lc = $lc_prev; XXX $cdata_mode_p = 0; } From acli at users.sourceforge.net Tue Feb 17 06:07:06 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 21:07:06 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.5,1.6 text-extract2.pl,1.38,1.39 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30220 Modified Files: TmplTokenizer.pm text-extract2.pl Log Message: Converted TmplTokenizer into a class. Everything still seems ok, but it is not tested thoroughly. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** TmplTokenizer.pm 17 Feb 2004 03:17:48 -0000 1.5 --- TmplTokenizer.pm 17 Feb 2004 05:07:04 -0000 1.6 *************** *** 13,17 **** =head1 NAME ! TmplTokenizer.pm - Simple-minded tokenizer for HTML::Template .tmpl files =head1 DESCRIPTION --- 13,17 ---- =head1 NAME ! TmplTokenizer.pm - Simple-minded tokenizer class for HTML::Template .tmpl files =head1 DESCRIPTION *************** *** 32,45 **** ############################################################################### ! $VERSION = 0.01; @ISA = qw(Exporter); @EXPORT_OK = qw(); - use vars qw( $input ); - use vars qw( $debug_dump_only_p ); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); - use vars qw( $fatal_p ); ############################################################################### --- 32,42 ---- ############################################################################### ! $VERSION = 0.02; @ISA = qw(Exporter); @EXPORT_OK = qw(); use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); ############################################################################### *************** *** 85,106 **** # End of the hideous stuff ! use vars qw( @readahead $lc_0 $lc $syntaxerror_p ); ! use vars qw( $cdata_mode_p $cdata_close ); ############################################################################### ! # Easy accessors ! sub fatal_p () { ! return $fatal_p; } ! sub syntaxerror_p () { ! return $syntaxerror_p; } ############################################################################### ! sub extract_attributes ($;$) { my($s, $lc) = @_; my %attr; --- 82,234 ---- # End of the hideous stuff ! use vars qw( $serial ); ############################################################################### ! sub FATAL_P () {'fatal-p'} ! sub SYNTAXERROR_P () {'syntaxerror-p'} ! sub FILENAME () {'input'} ! sub HANDLE () {'handle'} ! ! sub READAHEAD () {'readahead'} ! sub LINENUM_START () {'lc_0'} ! sub LINENUM () {'lc'} ! sub CDATA_MODE_P () {'cdata-mode-p'} ! sub CDATA_CLOSE () {'cdata-close'} ! ! sub new { ! my $this = shift; ! my($input) = @_; ! my $class = ref($this) || $this; ! my $self = {}; ! bless $self, $class; ! ! my $handle = sprintf('TMPLTOKENIZER%d', $serial); ! $serial += 1; ! ! no strict; ! open($handle, "<$input") || die "$input: $!\n"; ! use strict; ! $self->{+FILENAME} = $input; ! $self->{+HANDLE} = $handle; ! $self->{+READAHEAD} = []; ! return $self; ! } ! ! ############################################################################### ! ! # Simple getters ! ! sub _handle { ! my $this = shift; ! return $this->{+HANDLE}; ! } ! ! sub fatal_p { ! my $this = shift; ! return $this->{+FATAL_P}; ! } ! ! sub syntaxerror_p { ! my $this = shift; ! return $this->{+SYNTAXERROR_P}; ! } ! ! sub has_readahead_p { ! my $this = shift; ! return @{$this->{+READAHEAD}}; ! } ! ! sub _peek_readahead { ! my $this = shift; ! return $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}]; } ! sub line_number_start { ! my $this = shift; ! return $this->{+LINENUM_START}; ! } ! ! sub line_number { ! my $this = shift; ! return $this->{+LINENUM}; ! } ! ! sub cdata_mode_p { ! my $this = shift; ! return $this->{+CDATA_MODE_P}; ! } ! ! sub cdata_close { ! my $this = shift; ! return $this->{+CDATA_CLOSE}; ! } ! ! # Simple setters ! ! sub _set_fatal { ! my $this = shift; ! $this->{+FATAL_P} = $_[0]; ! return $this; ! } ! ! sub _set_syntaxerror { ! my $this = shift; ! $this->{+SYNTAXERROR_P} = $_[0]; ! return $this; ! } ! ! sub _push_readahead { ! my $this = shift; ! push @{$this->{+READAHEAD}}, $_[0]; ! return $this; ! } ! ! sub _pop_readahead { ! my $this = shift; ! return pop @{$this->{+READAHEAD}}; ! } ! ! sub _append_readahead { ! my $this = shift; ! $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}] .= $_[0]; ! return $this; ! } ! ! sub _set_readahead { ! my $this = shift; ! $this->{+READAHEAD}->[$#{$this->{+READAHEAD}}] = $_[0]; ! return $this; ! } ! ! sub _increment_line_number { ! my $this = shift; ! $this->{+LINENUM} += 1; ! return $this; ! } ! ! sub _set_line_number_start { ! my $this = shift; ! $this->{+LINENUM_START} = $_[0]; ! return $this; ! } ! ! sub _set_cdata_mode { ! my $this = shift; ! $this->{+CDATA_MODE_P} = $_[0]; ! return $this; ! } ! ! sub _set_cdata_close { ! my $this = shift; ! $this->{+CDATA_CLOSE} = $_[0]; ! return $this; } ############################################################################### ! sub _extract_attributes ($;$) { ! my $this = shift; my($s, $lc) = @_; my %attr; *************** *** 140,144 **** error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); ! $fatal_p = 1; } else { warn_normal "Strange attribute syntax: $s\n", $lc; --- 268,272 ---- error_normal("Completely confused while extracting attributes: $1", $lc); error_normal((scalar(split(/\n/, $s)) - 1) . " more line(s) not shown.", undef); ! $this->_set_fatal( 1 ); } else { warn_normal "Strange attribute syntax: $s\n", $lc; *************** *** 148,198 **** } ! sub next_token_internal (*) { my($h) = @_; my($it, $kind); my $eof_p = 0; ! pop @readahead if @readahead && !ref $readahead[$#readahead] ! && !length $readahead[$#readahead]; ! if (!@readahead) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { ! $lc += 1; ! push @readahead, $next; } } ! $lc_0 = $lc; # remember line number of first line ! if (@readahead && ref $readahead[$#readahead]) { # TmplToken object ! my $t = pop @readahead; ! ($it, $kind, local $lc) = ($t->string, $t->type, $t->line_number); ! } elsif ($eof_p && !@readahead) { # nothing left to do ; ! } elsif ($readahead[$#readahead] =~ /^\s+/s) { # whitespace ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($readahead[$#readahead] =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::TEXT, $&, $'); ! warn_normal "Unescaped < in $it\n", $lc_0 ! if !$cdata_mode_p && $it =~ /", $3); $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $lc_0 if $2 eq ''; ! } elsif ($readahead[$#readahead] =~ /^).)*-->/s) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::COMMENT, $&, $'); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $lc_0; ! $syntaxerror_p = 1; } last if $ok_p; --- 276,332 ---- } ! sub _next_token_internal { ! my $this = shift; my($h) = @_; my($it, $kind); my $eof_p = 0; ! $this->_pop_readahead if $this->has_readahead_p ! && !ref $this->_peek_readahead ! && !length $this->_peek_readahead; ! if (!$this->has_readahead_p) { my $next = scalar <$h>; $eof_p = !defined $next; if (!$eof_p) { ! $this->_increment_line_number; ! $this->_push_readahead( $next ); } } ! $this->_set_line_number_start( $this->line_number ); # remember 1st line num ! if ($this->has_readahead_p && ref $this->_peek_readahead) { # TmplToken obj. ! ($it, $kind) = ($this->_pop_readahead, undef); ! } elsif ($eof_p && !$this->has_readahead_p) { # nothing left to do ; ! } elsif ($this->_peek_readahead =~ /^\s+/s) { # whitespace ! ($kind, $it) = (TmplTokenType::TEXT, $&); ! $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ! ($kind, $it) = (TmplTokenType::TEXT, $&); ! $this->_set_readahead( $' ); ! warn_normal "Unescaped < in $it\n", $this->line_number_start ! if !$this->cdata_mode_p && $it =~ /cdata_close;;) { ! if ($this->cdata_mode_p) { ! if ($this->_peek_readahead =~ /^$cdata_close/) { ! ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_set_readahead( $' ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $this->_pop_readahead); $ok_p = 1; } ! } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! ($kind, $it) = (TmplTokenType::TAG, "$1>"); ! $this->_set_readahead( $3 ); $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $this->line_number_start if $2 eq ''; ! } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ! ($kind, $it) = (TmplTokenType::COMMENT, $&); ! $this->_set_readahead( $' ); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $this->line_number_start; ! $this->_set_syntaxerror( 1 ); } last if $ok_p; *************** *** 200,205 **** $eof_p = !defined $next; last if $eof_p; ! $lc += 1; ! $readahead[$#readahead] .= $next; } if ($kind ne TmplTokenType::TAG) { --- 334,339 ---- $eof_p = !defined $next; last if $eof_p; ! $this->_increment_line_number; ! $this->_append_readahead( $next ); } if ($kind ne TmplTokenType::TAG) { *************** *** 211,252 **** $kind = TmplTokenType::PI; } ! if ($it =~ /^$re_directive/ios && !$cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it, $readahead[$#readahead]) = (TmplTokenType::UNKNOWN, $readahead[$#readahead], undef); ! $syntaxerror_p = 1; } } ! warn_normal "Unrecognizable token found: $it\n", $lc_0 if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? TmplToken->new($it, $kind, $lc): undef; } ! sub next_token (*) { ! my($h) = @_; my $it; ! if (!$cdata_mode_p) { ! $it = next_token_internal($h); if (defined $it && $it->type eq TmplTokenType::TAG) { ! ($cdata_mode_p, $cdata_close) = (1, "") ! if $it->string =~ /^<(script|style|textarea)\b/i; ! $it->set_attributes( extract_attributes($it->string, $lc_0) ); } } else { ! for ($it = '';;) { ! my $lc_prev = $lc; ! my $next = next_token_internal($h); last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! push @readahead, $next; # push the entire TmplToken object ! #$lc = $lc_prev; XXX ! $cdata_mode_p = 0; } ! last unless $cdata_mode_p; $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $lc ); ! $cdata_close = undef; } return $it; --- 345,388 ---- $kind = TmplTokenType::PI; } ! if ($it =~ /^$re_directive/ios && !$this->cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; } if (!$ok_p && $eof_p) { ! ($kind, $it) = (TmplTokenType::UNKNOWN, $this->_peek_readahead); ! $this->_set_readahead, undef; ! $this->_set_syntaxerror( 1 ); } } ! warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number)): undef; } ! sub next_token { ! my $this = shift; ! my $h = $this->_handle; my $it; ! if (!$this->cdata_mode_p) { ! $it = $this->_next_token_internal($h); if (defined $it && $it->type eq TmplTokenType::TAG) { ! if ($it->string =~ /^<(script|style|textarea)\b/i) { ! $this->_set_cdata_mode( 1 ); ! $this->_set_cdata_close( "" ); ! } ! $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); } } else { ! for ($it = '', my $cdata_close = $this->cdata_close;;) { ! my $next = $this->_next_token_internal($h); last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/i) { ! $this->_push_readahead( $next ); # push entire TmplToken object ! $this->_set_cdata_mode( 0 ); } ! last unless $this->cdata_mode_p; $it .= $next->string; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); ! $this->_set_cdata_close, undef; } return $it; Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** text-extract2.pl 17 Feb 2004 03:02:39 -0000 1.38 --- text-extract2.pl 17 Feb 2004 05:07:04 -0000 1.39 *************** *** 26,30 **** ############################################################################### ! sub debug_dump (*) { # for testing only my($h) = @_; print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; --- 26,30 ---- ############################################################################### ! sub debug_dump ($) { # for testing only my($h) = @_; print "re_tag_compat is /", TmplTokenizer::re_tag(1), "/\n"; *************** *** 51,55 **** ############################################################################### ! sub text_extract (*) { my($h) = @_; my %text = (); --- 51,55 ---- ############################################################################### ! sub text_extract ($) { my($h) = @_; my %text = (); *************** *** 125,133 **** usage_error('Missing mandatory option -f') unless defined $input; ! open(INPUT, "<$input") || die "$0: $input: $!\n"; if ($debug_dump_only_p) { ! debug_dump(*INPUT); } else { ! text_extract(*INPUT); } --- 125,133 ---- usage_error('Missing mandatory option -f') unless defined $input; ! my $h = TmplTokenizer->new( $input ); if ($debug_dump_only_p) { ! debug_dump( $h ); } else { ! text_extract( $h ); } From acli at users.sourceforge.net Tue Feb 17 06:42:29 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 21:42:29 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.6,1.7 TmplToken.pm,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3053 Modified Files: TmplTokenizer.pm TmplToken.pm Log Message: Insert the filename of the token into the TmplToken object too Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** TmplTokenizer.pm 17 Feb 2004 05:07:04 -0000 1.6 --- TmplTokenizer.pm 17 Feb 2004 05:42:27 -0000 1.7 *************** *** 121,124 **** --- 121,129 ---- # Simple getters + sub filename { + my $this = shift; + return $this->{+FILENAME}; + } + sub _handle { my $this = shift; *************** *** 356,360 **** warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number)): undef; } --- 361,365 ---- warn_normal "Unrecognizable token found: $it\n", $this->line_number_start if $kind eq TmplTokenType::UNKNOWN; ! return defined $it? (ref $it? $it: TmplToken->new($it, $kind, $this->line_number, $this->filename)): undef; } Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TmplToken.pm 17 Feb 2004 02:45:27 -0000 1.1 --- TmplToken.pm 17 Feb 2004 05:42:27 -0000 1.2 *************** *** 33,37 **** my $self = {}; bless $self, $class; ! ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}) = @_; return $self; } --- 33,37 ---- my $self = {}; bless $self, $class; ! ($self->{'_string'}, $self->{'_type'}, $self->{'_lc'}, $self->{'_path'}) = @_; return $self; } *************** *** 47,50 **** --- 47,55 ---- } + sub pathname { + my $this = shift; + return $this->{'_path'} + } + sub line_number { my $this = shift; From acli at users.sourceforge.net Tue Feb 17 07:30:41 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 22:30:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator text-extract2.pl,1.39,1.40 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9919 Modified Files: text-extract2.pl Log Message: Don't extract strings from the VALUE attributes of RADIO type INPUT fields; these aren't translatable. Index: text-extract2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/text-extract2.pl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -r1.39 -r1.40 *** text-extract2.pl 17 Feb 2004 05:07:04 -0000 1.39 --- text-extract2.pl 17 Feb 2004 06:30:38 -0000 1.40 *************** *** 68,72 **** next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' ! || (ref $attr->{'type'} && $attr->{'type'}->[1] eq 'hidden')); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; --- 68,72 ---- next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' ! || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; From acli at users.sourceforge.net Tue Feb 17 08:26:31 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 23:26:31 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19352 Modified Files: TmplTokenizer.pm Log Message: Allow trim to return the trimmed whitespace if the caller wants them. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** TmplTokenizer.pm 17 Feb 2004 05:42:27 -0000 1.7 --- TmplTokenizer.pm 17 Feb 2004 07:26:29 -0000 1.8 *************** *** 405,411 **** sub trim ($) { my($s) = @_; ! $s =~ s/^(?:\s|\ $re_end_entity)+//os; ! $s =~ s/(?:\s|\ $re_end_entity)+$//os; ! return $s; } --- 405,410 ---- sub trim ($) { my($s) = @_; ! $s =~ /^(\s|\ $re_end_entity)*(.*)(\s|\ $re_end_entity)*$/os; ! return wantarray? ($2, $1, $3): $2; } From acli at users.sourceforge.net Tue Feb 17 08:45:19 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Mon, 16 Feb 2004 23:45:19 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21841 Modified Files: TmplTokenizer.pm Log Message: The previous change was wrong. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** TmplTokenizer.pm 17 Feb 2004 07:26:29 -0000 1.8 --- TmplTokenizer.pm 17 Feb 2004 07:45:17 -0000 1.9 *************** *** 404,410 **** sub trim ($) { ! my($s) = @_; ! $s =~ /^(\s|\ $re_end_entity)*(.*)(\s|\ $re_end_entity)*$/os; ! return wantarray? ($2, $1, $3): $2; } --- 404,413 ---- sub trim ($) { ! my($s0) = @_; ! my $l0 = length $s0; ! my $s = $s0; ! $s =~ s/^(\s|\ $re_end_entity)+//os; my $l1 = $l0 - length $s; ! $s =~ s/(\s|\ $re_end_entity)+$//os; my $l2 = $l0 - $l1 - length $s; ! return wantarray? (substr($s0, 0, $l1), $s, substr($s0, $l0 - $l2)): $s; } From oleonard at users.sourceforge.net Tue Feb 17 21:20:46 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:20:46 -0800 Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.9.2.1,1.9.2.2 Message-ID: Update of /cvsroot/koha/koha/opac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9775/opac Modified Files: Tag: rel_2_0 opac-detail.pl Log Message: Fix for Bug 679 (courtesy Stephen) Index: opac-detail.pl =================================================================== RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -r1.9.2.1 -r1.9.2.2 *** opac-detail.pl 6 Jan 2004 15:46:17 -0000 1.9.2.1 --- opac-detail.pl 17 Feb 2004 20:20:44 -0000 1.9.2.2 *************** *** 41,44 **** --- 41,54 ---- } + my @subjects; + my $subject; + my @subj = split /, /,($dat->{'subject'}); #split returned string into array + foreach my $subjct (@subj) { + $subject= { + SUBJECTS => $subjct, + }; + push @subjects, $subject; + } + $template->param(norequests => $norequests); *************** *** 49,56 **** --- 59,68 ---- my $webarray=\@webbiblioitems; my $sitearray=\@websites; + my $subjectsarray=\@subjects; $template->param(BIBLIO_RESULTS => $resultsarray); $template->param(ITEM_RESULTS => $itemsarray); $template->param(WEB_RESULTS => $webarray); + $template->param(SUBJECTS => $subjectsarray); $template->param(SITE_RESULTS => $sitearray, LibraryName => C4::Context->preference("LibraryName"), From oleonard at users.sourceforge.net Tue Feb 17 21:39:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:39:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-detail.tmpl,1.11.2.4,1.11.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13703/koha-tmpl/opac-tmpl/default/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -C2 -r1.11.2.4 -r1.11.2.5 *** opac-detail.tmpl 26 Jan 2004 10:49:11 -0000 1.11.2.4 --- opac-detail.tmpl 17 Feb 2004 20:39:05 -0000 1.11.2.5 *************** *** 19,40 **** ! ISBN:">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    Published by : in , ,
    ! Collection:
    ! Subject:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    Total Number of Items:     --- 19,48 ---- ! ISBN: ">
    ! Subtitle:
    ! Author: ">
    ! Additional Author:
    Published by : in , ,
    ! Collection:
    ! ! ! ! Subject(s): ! : "> !
    ! ! ! ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    Total Number of Items:     From oleonard at users.sourceforge.net Tue Feb 17 21:40:35 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:40:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.1.2.2,1.1.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13934/koha-tmpl/opac-tmpl/css/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** opac-detail.tmpl 13 Jan 2004 17:28:30 -0000 1.1.2.2 --- opac-detail.tmpl 17 Feb 2004 20:40:33 -0000 1.1.2.3 *************** *** 23,27 **** ISBN:
    Collection:
    ! Subject:
    Year :
    Notes:
    --- 23,35 ---- ISBN:
    Collection:
    ! ! ! ! Subject(s): ! : "> !
    ! ! ! Year :
    Notes:
    From oleonard at users.sourceforge.net Tue Feb 17 21:43:10 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 12:43:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en opac-detail.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14640/koha-tmpl/opac-tmpl/vanilla/en Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Modified to take advantage of fix for Bug 679 Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/opac-detail.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-detail.tmpl 18 Mar 2003 19:52:36 -0000 1.2 --- opac-detail.tmpl 17 Feb 2004 20:43:07 -0000 1.2.2.1 *************** *** 1,143 **** ! ! ! ! ! ! Details ! ! ! ! ! ! ! ! ! ! ! ! ! ! Home >Searching >Details ! ! !

    ! ! ! ! ! ! !
    ! ! ! !

    ! ()
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subtitle:
    Copyright:
    Subject: "> |
    Biblio Record:
    !

    		!
    ! ! > !
    !
    !     !

    ! !

    Holdings Information

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     
    Type/Format
    Class
    Location
    Due Date
    Last Seen
    Barcode
    !

    ! ! ! ! ! ! ! ! ! ! ! --- 1,143 ---- ! ! ! ! ! ! Details ! ! ! ! ! ! ! ! ! ! ! ! ! ! Home >Searching >Details ! ! !

    ! ! ! ! ! ! !
    ! ! ! !

    ! ()
    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Subtitle:
    Copyright:
    Subject(s): ! : "> !
    Biblio Record:
    !

    		!
    ! ! > !
    !
    !     !

    ! !

    Holdings Information

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
     
    Type/Format
    Class
    Location
    Due Date
    Last Seen
    Barcode
    !

    ! ! ! ! ! ! ! ! ! ! ! From oleonard at users.sourceforge.net Tue Feb 17 23:15:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 14:15:09 -0800 Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.32,1.32.2.1 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3237/circ Modified Files: Tag: rel_2_0 returns.pl Log Message: Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info Index: returns.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/returns.pl,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -C2 -r1.32 -r1.32.2.1 *** returns.pl 28 Oct 2003 19:34:05 -0000 1.32 --- returns.pl 17 Feb 2004 22:15:06 -0000 1.32.2.1 *************** *** 189,192 **** --- 189,199 ---- $template->param( found => 1, name => $name, + borfirstname => $borr->{'firstname'}, + borsurname => $borr->{'surname'}, + bortitle => $borr->{'title'}, + borphone => $borr->{'phone'}, + borstraddress => $borr->{'streetaddress'}, + borcity => $borr->{'city'}, + borzip => $borr->{'zipcode'}, bornum => $res->{'borrowernumber'}, borcnum => $borr->{'cardnumber'}, *************** *** 218,222 **** borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! bortown => $borr->{'town'}, boremail => $borr->{'emailadress'}, barcode => $barcode --- 225,230 ---- borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! borcity => $borr->{'city'}, ! borzip => $borr->{'zipcode'}, boremail => $borr->{'emailadress'}, barcode => $barcode From oleonard at users.sourceforge.net Tue Feb 17 23:15:36 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 17 Feb 2004 14:15:36 -0800 Subject: [Koha-cvs] CVS: koha/circ returns.pl,1.32,1.33 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3305/circ Modified Files: returns.pl Log Message: Adding variable declarations so that 'waiting' screen shows same information 'reserved' screen does, adding more address info Index: returns.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/returns.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** returns.pl 28 Oct 2003 19:34:05 -0000 1.32 --- returns.pl 17 Feb 2004 22:15:33 -0000 1.33 *************** *** 189,192 **** --- 189,199 ---- $template->param( found => 1, name => $name, + borfirstname => $borr->{'firstname'}, + borsurname => $borr->{'surname'}, + bortitle => $borr->{'title'}, + borphone => $borr->{'phone'}, + borstraddress => $borr->{'streetaddress'}, + borcity => $borr->{'city'}, + borzip => $borr->{'zipcode'}, bornum => $res->{'borrowernumber'}, borcnum => $borr->{'cardnumber'}, *************** *** 218,222 **** borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! bortown => $borr->{'town'}, boremail => $borr->{'emailadress'}, barcode => $barcode --- 225,230 ---- borstraddress => $borr->{'streetaddress'}, borsub => $borr->{'suburb'}, ! borcity => $borr->{'city'}, ! borzip => $borr->{'zipcode'}, boremail => $borr->{'emailadress'}, barcode => $barcode From acli at users.sourceforge.net Wed Feb 18 07:39:36 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 17 Feb 2004 22:39:36 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator translator_doc.txt,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30946 Modified Files: translator_doc.txt Log Message: Updated w.r.t. the text-extract2.pl filter. Index: translator_doc.txt =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** translator_doc.txt 11 Feb 2004 08:42:02 -0000 1.2 --- translator_doc.txt 18 Feb 2004 06:39:34 -0000 1.3 *************** *** 34,37 **** --- 34,38 ---- - HTML::Templates pb : if there is only a tag between 2 strings, text-extract sometimes merges both strings, and so can't replace them in the translated template. I've solved all those cases with a
    or another HTML statement. + The text-extract2.pl filter attempts to address this problem; it seems that the new filter is now working correctly. - SHORT STATEMENTS *************** *** 67,70 **** --- 68,74 ---- - meta html encoding (8859-1) to enable non european translations. + - DIFFERENT WORD ORDER + Some languages have different word order than English in sentences, or even in dates. For these languages, it is impossible to make a good translation at the moment. + COPYRIGHT ====== From acli at users.sourceforge.net Wed Feb 18 07:56:23 2004 From: acli at users.sourceforge.net (Ambrose Li) Date: Tue, 17 Feb 2004 22:56:23 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1378 Modified Files: TmplTokenizer.pm Log Message: Warn against Apache #include directive Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** TmplTokenizer.pm 17 Feb 2004 07:45:17 -0000 1.9 --- TmplTokenizer.pm 18 Feb 2004 06:56:19 -0000 1.10 *************** *** 347,350 **** --- 347,353 ---- $kind = TmplTokenType::DECL; $kind = TmplTokenType::COMMENT if $it =~ /^).)*-->/; + if ($kind == TmplTokenType::COMMENT && $it =~ /^ Using per-directory sticky tag `rel_2_0' From tipaul at users.sourceforge.net Thu Feb 19 11:14:38 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:14:38 -0800 Subject: [Koha-cvs] CVS: koha/bookshelves addbookbybiblionumber.pl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22484/bookshelves Added Files: Tag: rel_2_0 addbookbybiblionumber.pl Log Message: new feature : adding book to bookshelf from biblio detail screen. --- NEW FILE --- #!/usr/bin/perl #script to provide bookshelf management # WARNING: This file uses 4-character tabs! # # $Header: /cvsroot/koha/koha/bookshelves/Attic/addbookbybiblionumber.pl,v 1.1.2.1 2004/02/19 10:14:36 tipaul Exp $ # # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. # # Koha is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # # Koha is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA use strict; use C4::Search; use C4::Biblio; use CGI; use C4::Output; use C4::BookShelves; use C4::Circulation::Circ2; use C4::Auth; use C4::Interface::CGI::Output; use HTML::Template; my $env; my $query = new CGI; my $biblionumber = $query->param('biblionumber'); my $shelfnumber = $query->param('shelfnumber'); if ($shelfnumber) { &AddToShelfFromBiblio($env, $biblionumber, $shelfnumber); print "Content-Type: text/html\n\n"; exit; } else { my ( $bibliocount, @biblios ) = getbiblio($biblionumber); my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "bookshelves/addbookbybiblionumber.tmpl", query => $query, type => "intranet", authnotrequired => 0, flagsrequired => {catalogue => 1}, }); my ($shelflist) = GetShelfList(); my @shelvesloop; my %shelvesloop; foreach my $element (sort keys %$shelflist) { push (@shelvesloop, $element); $shelvesloop{$element} = $shelflist->{$element}->{'shelfname'}; } my $CGIbookshelves=CGI::scrolling_list( -name => 'shelfnumber', -values => \@shelvesloop, -labels => \%shelvesloop, -size => 1, -multiple => 0 ); $template->param(biblionumber => $biblionumber, title => $biblios[0]->{'title'}, author => $biblios[0]->{'author'}, CGIbookshelves => $CGIbookshelves, ); output_html_with_http_headers $query, $cookie, $template->output; } # $Log: addbookbybiblionumber.pl,v $ # Revision 1.1.2.1 2004/02/19 10:14:36 tipaul # new feature : adding book to bookshelf from biblio detail screen. # # Local Variables: # tab-width: 4 # End: From tipaul at users.sourceforge.net Thu Feb 19 11:16:35 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:16:35 -0800 Subject: [Koha-cvs] CVS: koha/C4 Catalogue.pm,1.36.2.1,1.36.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22883/C4 Modified Files: Tag: rel_2_0 Catalogue.pm Log Message: #662 prepare/execute with (?) Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -C2 -r1.36.2.1 -r1.36.2.2 *** Catalogue.pm 13 Jan 2004 17:30:23 -0000 1.36.2.1 --- Catalogue.pm 19 Feb 2004 10:16:31 -0000 1.36.2.2 *************** *** 828,835 **** my ($searchstring)=@_; my $dbh = C4::Context->dbh; ! my $query="Select * from aqbooksellers where name like '$searchstring%' or ! id = '$searchstring'"; my $sth=$dbh->prepare($query); ! $sth->execute; my @results; my $i=0; --- 828,834 ---- my ($searchstring)=@_; my $dbh = C4::Context->dbh; ! my $query="Select * from aqbooksellers where name like ? or id =? "; my $sth=$dbh->prepare($query); ! $sth->execute("$searchstring%",$searchstring); my @results; my $i=0; From tipaul at users.sourceforge.net Thu Feb 19 11:15:44 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:15:44 -0800 Subject: [Koha-cvs] CVS: koha/C4 BookShelves.pm,1.11.2.1,1.11.2.2 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22735/C4 Modified Files: Tag: rel_2_0 BookShelves.pm Log Message: new feature : adding book to bookshelf from biblio detail screen. Index: BookShelves.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/BookShelves.pm,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -r1.11.2.1 -r1.11.2.2 *** BookShelves.pm 6 Feb 2004 14:16:55 -0000 1.11.2.1 --- BookShelves.pm 19 Feb 2004 10:15:41 -0000 1.11.2.2 *************** *** 54,58 **** @ISA = qw(Exporter); ! @EXPORT = qw(&GetShelfList &GetShelfContents &AddToShelf &RemoveFromShelf &AddShelf &RemoveShelf); my $dbh = C4::Context->dbh; --- 54,59 ---- @ISA = qw(Exporter); ! @EXPORT = qw(&GetShelfList &GetShelfContents &AddToShelf &AddToShelfFromBiblio ! &RemoveFromShelf &AddShelf &RemoveShelf); my $dbh = C4::Context->dbh; *************** *** 86,104 **** # hash. sub GetShelfList { ! # FIXME - These two database queries can be combined into one: ! # SELECT bookshelf.shelfnumber, bookshelf.shelfname, ! # count(shelfcontents.itemnumber) ! # FROM bookshelf ! # LEFT JOIN shelfcontents ! # ON bookshelf.shelfnumber = shelfcontents.shelfnumber ! # GROUP BY bookshelf.shelfnumber ! my $sth=$dbh->prepare("select shelfnumber,shelfname from bookshelf"); $sth->execute; my %shelflist; ! while (my ($shelfnumber, $shelfname) = $sth->fetchrow) { ! my $sti=$dbh->prepare("select count(*) from shelfcontents where shelfnumber=?"); ! # FIXME - Should there be an "order by" in here somewhere? ! $sti->execute($shelfnumber); ! my ($count) = $sti->fetchrow; $shelflist{$shelfnumber}->{'shelfname'}=$shelfname; $shelflist{$shelfnumber}->{'count'}=$count; --- 87,99 ---- # hash. sub GetShelfList { ! my $sth=$dbh->prepare("SELECT bookshelf.shelfnumber, bookshelf.shelfname, ! count(shelfcontents.itemnumber) as count ! FROM bookshelf ! LEFT JOIN shelfcontents ! ON bookshelf.shelfnumber = shelfcontents.shelfnumber ! GROUP BY bookshelf.shelfnumber order by shelfname"); $sth->execute; my %shelflist; ! while (my ($shelfnumber, $shelfname,$count) = $sth->fetchrow) { $shelflist{$shelfnumber}->{'shelfname'}=$shelfname; $shelflist{$shelfnumber}->{'count'}=$count; *************** *** 157,160 **** --- 152,170 ---- } } + sub AddToShelfFromBiblio { + my ($env, $biblionumber, $shelfnumber) = @_; + return unless $biblionumber; + my $sth = $dbh->prepare("select itemnumber from items where biblionumber=?"); + $sth->execute($biblionumber); + my ($itemnumber) = $sth->fetchrow; + $sth=$dbh->prepare("select * from shelfcontents where shelfnumber=? and itemnumber=?"); + $sth->execute($shelfnumber, $itemnumber); + if ($sth->rows) { + # already on shelf + } else { + $sth=$dbh->prepare("insert into shelfcontents (shelfnumber, itemnumber, flags) values (?, ?, 0)"); + $sth->execute($shelfnumber, $itemnumber); + } + } =item RemoveFromShelf *************** *** 240,243 **** --- 250,256 ---- # # $Log$ + # Revision 1.11.2.2 2004/02/19 10:15:41 tipaul + # new feature : adding book to bookshelf from biblio detail screen. + # # Revision 1.11.2.1 2004/02/06 14:16:55 tipaul # fixing bugs in bookshelves management. From tipaul at users.sourceforge.net Thu Feb 19 11:20:00 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:00 -0800 Subject: [Koha-cvs] CVS: koha/C4 Search.pm,1.85.2.4,1.85.2.5 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23353/C4 Modified Files: Tag: rel_2_0 Search.pm Log Message: Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.85.2.4 retrieving revision 1.85.2.5 diff -C2 -r1.85.2.4 -r1.85.2.5 *** Search.pm 6 Feb 2004 14:21:54 -0000 1.85.2.4 --- Search.pm 19 Feb 2004 10:19:57 -0000 1.85.2.5 *************** *** 1336,1340 **** if ($datedue eq ''){ # $datedue="Available"; ! my ($restype,$reserves)=CheckReserves($data->{'itemnumber'}); if ($restype){ $datedue=$restype; --- 1336,1340 ---- if ($datedue eq ''){ # $datedue="Available"; ! my ($restype,$reserves)=C4::Reserves2::CheckReserves($data->{'itemnumber'}); if ($restype){ $datedue=$restype; From tipaul at users.sourceforge.net Thu Feb 19 11:20:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl opac.html,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl Modified Files: Tag: rel_2_0 opac.html Log Message: Index: opac.html =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac.html 9 Apr 2003 08:40:28 -0000 1.2 --- opac.html 19 Feb 2004 10:20:21 -0000 1.2.2.1 *************** *** 6,10 ****
    ! WELCOME TO KOHA
    --- 6,14 ---- ! ! !
    ! WELCOME TO KOHA
    ! BIENVENUE DANS KOHA
    From tipaul at users.sourceforge.net Thu Feb 19 11:20:24 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple additem.tmpl,1.13.2.2,1.13.2.3 isbnsearch.tmpl,1.11.2.1,1.11.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl/intranet-tmpl/default/en/acqui.simple Modified Files: Tag: rel_2_0 additem.tmpl isbnsearch.tmpl Log Message: Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -C2 -r1.13.2.2 -r1.13.2.3 *** additem.tmpl 26 Jan 2004 10:46:36 -0000 1.13.2.2 --- additem.tmpl 19 Feb 2004 10:20:21 -0000 1.13.2.3 *************** *** 17,20 **** --- 17,21 ---- ">//images/fileopen.png"> ">Normal + ')">Print MARC biblio : *************** *** 123,126 **** --- 124,131 ---- newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } + function Doprint(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes'); + } + function confirm_deletion(bibid,itemnum) { var is_confirmed = confirm('Do you confirm item deletion ?'); Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -r1.11.2.1 -r1.11.2.2 *** isbnsearch.tmpl 10 Feb 2004 13:17:08 -0000 1.11.2.1 --- isbnsearch.tmpl 19 Feb 2004 10:20:21 -0000 1.11.2.2 *************** *** 4,8 **** You searched on ISBN title
    ! results found
    Results to displayed --- 4,8 ---- You searched on ISBN title
    ! results found
    Results to displayed From tipaul at users.sourceforge.net Thu Feb 19 11:20:25 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:20:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.8.2.2,1.8.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23434/koha-tmpl/intranet-tmpl/default/en/acqui Modified Files: Tag: rel_2_0 newbiblio.tmpl Log Message: Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -r1.8.2.2 -r1.8.2.3 *** newbiblio.tmpl 26 Jan 2004 10:46:36 -0000 1.8.2.2 --- newbiblio.tmpl 19 Feb 2004 10:20:22 -0000 1.8.2.3 *************** *** 94,98 **** ! Format --- 94,98 ---- ! Item type From tipaul at users.sourceforge.net Thu Feb 19 11:21:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:21:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bookshelves - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23606/koha-tmpl/intranet-tmpl/default/en/bookshelves Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves added to the repository --> Using per-directory sticky tag `rel_2_0' From tipaul at users.sourceforge.net Thu Feb 19 11:22:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:22:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bookshelves In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23787/koha-tmpl/intranet-tmpl/default/en/bookshelves Added Files: Tag: rel_2_0 addbookbybiblionumber.tmpl Log Message: new feature : adding book to bookshelf from biblio detail screen. --- NEW FILE ---

    "> Title :
    Author :
    Add to virtual shelf :
    From tipaul at users.sourceforge.net Thu Feb 19 11:22:50 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:22:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.14.2.1,1.14.2.2 searchresults.tmpl,1.7.2.1,1.7.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23866/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 MARCdetail.tmpl searchresults.tmpl Log Message: new feature : adding book to bookshelf from biblio detail screen. Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -C2 -r1.14.2.1 -r1.14.2.2 *** MARCdetail.tmpl 10 Feb 2004 13:17:57 -0000 1.14.2.1 --- MARCdetail.tmpl 19 Feb 2004 10:22:46 -0000 1.14.2.2 *************** *** 20,23 **** --- 20,24 ---- ">Normal ')">Print + ')">Add to shelf MARC biblio : Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -r1.7.2.1 -r1.7.2.2 *** searchresults.tmpl 26 Jan 2004 10:46:35 -0000 1.7.2.1 --- searchresults.tmpl 19 Feb 2004 10:22:46 -0000 1.7.2.2 *************** *** 55,59 **** ! >Request --- 55,63 ---- ! ! >Request ! ! Not Reservable ! From tipaul at users.sourceforge.net Thu Feb 19 11:24:19 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:24:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_60X.tmpl,1.2,1.2.2.1 unimarc_field_700_701_702.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24105/koha-tmpl/intranet-tmpl/default/en/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: textarea 5 lines instead of 10 Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** unimarc_field_60X.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- unimarc_field_60X.tmpl 19 Feb 2004 10:24:17 -0000 1.2.2.1 *************** *** 23,29 ****
    !
    !

    Recherche

    A B --- 23,29 ---- !
    !

    Search

    A B Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700_701_702.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** unimarc_field_700_701_702.tmpl 9 Dec 2003 10:28:58 -0000 1.2 --- unimarc_field_700_701_702.tmpl 19 Feb 2004 10:24:17 -0000 1.2.2.1 *************** *** 6,10 **** !

    "> "> --- 6,11 ---- !
    !

    "> "> *************** *** 14,18 **** "> "> !

    --- 15,19 ---- "> "> ! *************** *** 23,27 **** "> ! --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:24:40 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:24:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en thesaurus_popup.tmpl,1.4.2.1,1.4.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24149/koha-tmpl/intranet-tmpl/default/en Modified Files: Tag: rel_2_0 thesaurus_popup.tmpl Log Message: textarea 5 lines instead of 10 Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** thesaurus_popup.tmpl 26 Jan 2004 10:46:35 -0000 1.4.2.1 --- thesaurus_popup.tmpl 19 Feb 2004 10:24:32 -0000 1.4.2.2 *************** *** 5,9 ****
    !

    --- 5,9 ---- !

    *************** *** 24,28 **** "> !

    --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue searchresults.tmpl,1.2.2.4,1.2.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/catalogue Modified Files: Tag: rel_2_0 searchresults.tmpl Log Message: french version of previous commits Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -r1.2.2.4 -r1.2.2.5 *** searchresults.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 --- searchresults.tmpl 19 Feb 2004 10:26:06 -0000 1.2.2.5 *************** *** 55,59 **** ! >R?servation --- 55,63 ---- ! ! >R?servation ! ! Not Reservable ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr thesaurus_popup.tmpl,1.3.2.3,1.3.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr Modified Files: Tag: rel_2_0 thesaurus_popup.tmpl Log Message: french version of previous commits Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -r1.3.2.3 -r1.3.2.4 *** thesaurus_popup.tmpl 10 Feb 2004 14:05:39 -0000 1.3.2.3 --- thesaurus_popup.tmpl 19 Feb 2004 10:26:04 -0000 1.3.2.4 *************** *** 5,9 ****
    !

    --- 5,9 ---- !

    *************** *** 24,28 **** "> !

    --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:09 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_60X.tmpl,1.2.2.3,1.2.2.4 unimarc_field_700_701_702.tmpl,1.1.2.3,1.1.2.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/value_builder Modified Files: Tag: rel_2_0 unimarc_field_60X.tmpl unimarc_field_700_701_702.tmpl Log Message: french version of previous commits Index: unimarc_field_60X.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -r1.2.2.3 -r1.2.2.4 *** unimarc_field_60X.tmpl 10 Feb 2004 14:07:44 -0000 1.2.2.3 --- unimarc_field_60X.tmpl 19 Feb 2004 10:26:06 -0000 1.2.2.4 *************** *** 23,29 ****
    !
    !

    Recherche

    A B --- 23,29 ---- !
    !

    Chercher

    A B Index: unimarc_field_700_701_702.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** unimarc_field_700_701_702.tmpl 10 Feb 2004 14:07:44 -0000 1.1.2.3 --- unimarc_field_700_701_702.tmpl 19 Feb 2004 10:26:06 -0000 1.1.2.4 *************** *** 6,10 **** !

    "> "> --- 6,11 ---- !
    !

    "> "> *************** *** 14,18 **** "> "> !

    --- 15,19 ---- "> "> ! *************** *** 23,27 **** "> ! --- 24,28 ---- "> ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui newbiblio.tmpl,1.5.2.4,1.5.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/acqui Modified Files: Tag: rel_2_0 newbiblio.tmpl Log Message: french version of previous commits Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -C2 -r1.5.2.4 -r1.5.2.5 *** newbiblio.tmpl 10 Feb 2004 14:05:39 -0000 1.5.2.4 --- newbiblio.tmpl 19 Feb 2004 10:26:07 -0000 1.5.2.5 *************** *** 3,7 **** --- 94,98 ---- ! Cat?g ouvrage *************** *** 115,119 **** Quantit? ! " onchange='mettre ? jour(this.form)' > --- 115,119 ---- Quantit? ! " onchange='update(this.form)' > *************** *** 123,143 **** Prix catalogue du fournisseur ! " onchange='mettre ? jour(this.form)'> Frais Remplacement
    ! " onchange='mettre ? jour(this.form)'> Co?ts budget?s
    (ex TVA, remise) ! " onchange='mettre ? jour(this.form)'> GST budget? ! TOTAL BUDGETE ! --- 123,143 ---- Prix catalogue du fournisseur ! " onchange='update(this.form)'> Frais Remplacement
    ! " onchange='update(this.form)'> Co?ts budget?s
    (ex TVA, remise) ! " onchange='update(this.form)'> GST budget? ! TOTAL BUDGETE ! From tipaul at users.sourceforge.net Thu Feb 19 11:26:10 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple additem.tmpl,1.5.2.4,1.5.2.5 isbnsearch.tmpl,1.2.2.4,1.2.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24402/koha-tmpl/intranet-tmpl/default/fr/acqui.simple Modified Files: Tag: rel_2_0 additem.tmpl isbnsearch.tmpl Log Message: french version of previous commits Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -C2 -r1.5.2.4 -r1.5.2.5 *** additem.tmpl 28 Jan 2004 16:44:57 -0000 1.5.2.4 --- additem.tmpl 19 Feb 2004 10:26:07 -0000 1.5.2.5 *************** *** 17,20 **** --- 17,21 ---- ">//images/fileopen.png"> ">Normal + ')">Imprimer Notice biblio MARC : *************** *** 123,126 **** --- 124,131 ---- newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=oui'); } + function Doprint(link) { + newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=oui'); + } + function confirm_deletion(bibid,itemnum) { var is_confirmed = confirm('Do you confirm item deletion ?'); Index: isbnsearch.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -r1.2.2.4 -r1.2.2.5 *** isbnsearch.tmpl 10 Feb 2004 14:06:18 -0000 1.2.2.4 --- isbnsearch.tmpl 19 Feb 2004 10:26:07 -0000 1.2.2.5 *************** *** 4,8 **** Recherche effectu?e sur ISBN title
    ! R?sultats trouv?s
    R?sultats to affich? --- 4,8 ---- Recherche effectu?e sur ISBN title
    ! R?sultats trouv?s
    R?sultats to affich? From tipaul at users.sourceforge.net Thu Feb 19 11:26:41 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Thu, 19 Feb 2004 02:26:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.fr,1.1.2.5,1.1.2.6 opac-css.fr,1.1.2.5,1.1.2.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24520/misc/translator Modified Files: Tag: rel_2_0 intranet.fr opac-css.fr Log Message: french translation file update Index: intranet.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.fr,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** intranet.fr 10 Feb 2004 13:51:38 -0000 1.1.2.5 --- intranet.fr 19 Feb 2004 10:26:36 -0000 1.1.2.6 *************** *** 6,11 **** Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE - ACQUISITIONS ACQUISITIONS Acquisitions Acquisitions action=modrequest.pl method=post> ***** Active Actif --- 6,11 ---- Account Management Fee Frais de gestion de compte ACCOUNTING DETAILS DETAILS COMPTABILITE Acquisitions Acquisitions + ACQUISITIONS ACQUISITIONS action=modrequest.pl method=post> ***** Active Actif *************** *** 28,33 **** Add criteria Ajouter un crit?re Add currency Ajouter une monnaie - Add item Ajouter un ouvrage Add Item Ajouter un ouvrage Add item type Ajouter cat?gorie d'ouvrage Add member Ajouter un lecteur --- 28,33 ---- Add criteria Ajouter un crit?re Add currency Ajouter une monnaie Add Item Ajouter un ouvrage + Add item Ajouter un ouvrage Add item type Ajouter cat?gorie d'ouvrage Add member Ajouter un lecteur *************** *** 82,87 **** Alternative Phone Autre t?l?phone Ambrose Li ***** - Amount Montant AMOUNT MONTANT AMOUNT OWING Montant de l'avoir An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table Une "valeur autoris?e": se r?f?re ? une liste de valeurs autoris?es pour ce sous-champs. Voir la table admin correspondante. --- 82,87 ---- Alternative Phone Autre t?l?phone Ambrose Li ***** AMOUNT MONTANT + Amount Montant AMOUNT OWING Montant de l'avoir An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table Une "valeur autoris?e": se r?f?re ? une liste de valeurs autoris?es pour ce sous-champs. Voir la table admin correspondante. *************** *** 120,125 **** BARCODE CODE BARRE Barcode Code barre - BASKET PANIER Basket Panier Baycorp Adjustment ***** be in tab -1 ?tre dans l'onglet -1 (items) --- 120,125 ---- BARCODE CODE BARRE Barcode Code barre Basket Panier + BASKET PANIER Baycorp Adjustment ***** be in tab -1 ?tre dans l'onglet -1 (items) *************** *** 129,133 **** Become a Member S'inscrire Benedykt P. Barszcz (polish for 2.0 ***** - Benedykt P. Barszcz (polish for 2.0) UNUSED;1 Between Brothers by Irene Morck at Main Library ***** bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ***** --- 129,132 ---- *************** *** 153,161 **** Bookfund admin Admin Compte Bookshelves Rayonnages - Borrower Emprunteur borrower emprunteur Borrower categories Cat?gories d'emprunteurs - Borrower information Informations emprunteur Borrower Information Informations Emprunteur Borrowernumber N? Lecteur BORROWERS EMPRUNTEURS --- 152,160 ---- Bookfund admin Admin Compte Bookshelves Rayonnages borrower emprunteur + Borrower Emprunteur Borrower categories Cat?gories d'emprunteurs Borrower Information Informations Emprunteur + Borrower information Informations emprunteur Borrowernumber N? Lecteur BORROWERS EMPRUNTEURS *************** *** 174,179 **** Budget amount Montant budget budgetamount LIMITED;budgetamount ! Budgeted Cost Co?ts budget?s ! Budgeted GST GST budget? BUDGETED TOTAL TOTAL BUDGETE Budgets Budgets --- 173,178 ---- Budget amount Montant budget budgetamount LIMITED;budgetamount ! Budgeted Cost Co?ts budg?t?s ! Budgeted GST TVA budg?t?e BUDGETED TOTAL TOTAL BUDGETE Budgets Budgets *************** *** 295,300 **** Define the categories of borrowers D?finir cat?gories d'emprunteurs Del Suppr. - delete LIMITED;supprimer Delete LIMITED;Supprimer Delete a request by selecting "del" from the rank list Supprimer une demande en s?lectionnant "suppr." dans la liste Delete Shelves Supprimer Rayonnages --- 294,299 ---- Define the categories of borrowers D?finir cat?gories d'emprunteurs Del Suppr. Delete LIMITED;Supprimer + delete LIMITED;supprimer Delete a request by selecting "del" from the rank list Supprimer une demande en s?lectionnant "suppr." dans la liste Delete Shelves Supprimer Rayonnages *************** *** 339,344 **** Enter Book Barcode Entrer Code barre du livre Enter borrower card number Entrer N? carte de lecteur - Error Erreur ERROR ERREUR ERROR : Barcode already exists ! ERREUR: Code barre existe d?j?! Error Issuing Book Erreur pr?t d'un livre --- 338,343 ---- Enter Book Barcode Entrer Code barre du livre Enter borrower card number Entrer N? carte de lecteur ERROR ERREUR + Error Erreur ERROR : Barcode already exists ! ERREUR: Code barre existe d?j?! Error Issuing Book Erreur pr?t d'un livre *************** *** 347,358 **** Ethnicity Notes Notes appartenance ethnique ex GST, inc discount ex TVA, remise - exact exact Exact Exact EXCHANGE RATES TAUX DE CHANGE Existing items Ouvrages existant Expiry Date Date d'expiration Explanation Explication - export LIMITED;exporter Export LIMITED;Exporter Export in MARC format the following biblios Exporter en format MARC les les biblios suivants Exporting in MARC format Exporter en format MARC --- 346,357 ---- Ethnicity Notes Notes appartenance ethnique ex GST, inc discount ex TVA, remise Exact Exact + exact exact EXCHANGE RATES TAUX DE CHANGE Existing items Ouvrages existant Expiry Date Date d'expiration Explanation Explication Export LIMITED;Exporter + export LIMITED;exporter Export in MARC format the following biblios Exporter en format MARC les les biblios suivants Exporting in MARC format Exporter en format MARC *************** *** 367,372 **** FINES & CHARGES AMENDES & FRAIS Firstname Pr?nom - FLAGS DRAPEAUX Flags Drapeaux Florian Bischof ***** for LIMITED;pour --- 366,371 ---- FINES & CHARGES AMENDES & FRAIS Firstname Pr?nom Flags Drapeaux + FLAGS DRAPEAUX Florian Bischof ***** for LIMITED;pour *************** *** 393,398 **** GROUP - GROUP - Group Number N? Groupe ! GST GST ! GST Registered GST enregistr? Guarantees Garanties Guarantor Garant --- 392,397 ---- GROUP - GROUP - Group Number N? Groupe ! GST TVA ! GST Registered TVA ? payer Guarantees Garanties Guarantor Garant *************** *** 443,447 **** Invalid cardnumber N? carte invalide Invoice Facture ! Invoice Item Price Includes GST Prix de la facture de l'ouvrage inclus le GST Invoice Number N? facture Invoice Prices are Prix factur?s sont --- 442,446 ---- Invalid cardnumber N? carte invalide Invoice Facture ! Invoice Item Price Includes GST Prix de la facture de l'ouvrage inclus la TVA Invoice Number N? facture Invoice Prices are Prix factur?s sont *************** *** 458,462 **** Issuing Question Question sur le pr?t Item Ouvrage - Item () UNUSED;Ouvrage Item added with barcode Ouvrage ajout? avec un code barre Item Barcode Code barre d'un ouvrage --- 457,460 ---- *************** *** 472,476 **** Item types Categ. ouvrages Item waiting at Ouvrage en attente ? - Item: () UNUSED;Ouvrage ItemNotes Notes ouvrage itemnum IGNORE --- 470,473 ---- *************** *** 530,538 **** Links Koha - MARC DB Liens Koha - base de donn?es MARC Links to Associated Websites Liens vers des sites Web associ?s ! List Item Price Includes GST Prix catalogue de l'ouvrage inclus le GST List Prices are Prix catalogue sont Loan length Dur?e de pr?t - Location Localisation LOCATION LOCALISATION Log In S'identifier Log Out D?connecter --- 527,535 ---- Links Koha - MARC DB Liens Koha - base de donn?es MARC Links to Associated Websites Liens vers des sites Web associ?s ! List Item Price Includes GST Prix catalogue de l'ouvrage inclus la TVA List Prices are Prix catalogue sont Loan length Dur?e de pr?t LOCATION LOCALISATION + Location Localisation Log In S'identifier Log Out D?connecter *************** *** 588,599 **** Michaes Herman ***** Michel Lerenard (Esiee School ***** - Michel Lerenard (Esiee School) UNUSED;1 Mike Hansen ***** Mike Johnson ***** Mike Mylonas ***** MJ Ray and Turo Technology LLP, england (quality control, installer & updater ***** - MJ Ray and Turo Technology LLP, england (quality control, installer & updater) UNUSED;1 - Modify Modifier modify modifier Modify a system preference Modifier une pr?f?rence syst?me Modify category Modifier Cat?gorie --- 585,594 ---- Michaes Herman ***** Michel Lerenard (Esiee School ***** Mike Hansen ***** Mike Johnson ***** Mike Mylonas ***** MJ Ray and Turo Technology LLP, england (quality control, installer & updater ***** modify modifier + Modify Modifier Modify a system preference Modifier une pr?f?rence syst?me Modify category Modifier Cat?gorie *************** *** 647,652 **** No. of Items Nombre d'ouvrages Non-Fiction Documentaire - normal normal Normal Normal Not for loan Non empruntable not imported because already in DB pas import?, car d?j? existant dans la base de donn?es --- 642,647 ---- No. of Items Nombre d'ouvrages Non-Fiction Documentaire Normal Normal + normal normal Not for loan Non empruntable not imported because already in DB pas import?, car d?j? existant dans la base de donn?es *************** *** 654,657 **** --- 649,653 ---- not imported because they seems not to be MARC format (or ISBN/ISSN missing) ! pas import?, car il semble que ce n'est pas un format MARC (ou ISBN/ISSN manquant) ! Not on Issue Pas en pr?t + Not Reservable ***** Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night Note : les amendes sont calcul?es par le misc/script fines2.pl. Demandez ? votre administrateur de mettre ce script dans le crontab, apr?s minuit, pour que les amendes soient calcul?es chaque nuit NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script Note : si vous changez quelque chose dans cette table, demandez ? votre administrateur de lancer le script misc/rebuildnonmarc.pl *************** *** 659,664 **** Note : the items are NOT exported by this tool Note: les ouvrages en sont PAS export?s par cet outil Note: in the last column, you can choose Note: dans la derni?re colonne, vous pouvez choisir - NOTES NOTES Notes Notes nothing entered pas de saisie Nothing found Rien trouv? --- 655,660 ---- Note : the items are NOT exported by this tool Note: les ouvrages en sont PAS export?s par cet outil Note: in the last column, you can choose Note: dans la derni?re colonne, vous pouvez choisir Notes Notes + NOTES NOTES nothing entered pas de saisie Nothing found Rien trouv? *************** *** 677,682 **** opac opac options >>?? ***** - or ou OR OU OR Add to a new Group ou ajouter ? un nouveau groupe OR MODIFY DETAILS ou modifie les d?tails --- 673,678 ---- opac opac options >>?? ***** OR OU + or ou OR Add to a new Group ou ajouter ? un nouveau groupe OR MODIFY DETAILS ou modifie les d?tails *************** *** 750,755 **** Publisher Editeur Publishers and Imprints Edition - QTY QUANTITE Qty Quantit? Quantity Quantit? Quantity Ordered Quantit? command?e --- 746,751 ---- Publisher Editeur Publishers and Imprints Edition Qty Quantit? + QTY QUANTITE Quantity Quantit? Quantity Ordered Quantit? command?e *************** *** 767,771 **** Receive Orders From Supplier R?ceptionner commandes d'un fournisseur Received By Re?u par - Recherche ***** Recieved Re?u Record already in database Notice d?j? existante --- 763,766 ---- *************** *** 792,799 **** Replacement Price Prix Remplacement Reporter Reporter - Reports LIMITED;Rapports reports LIMITED;rapports ! request LIMITED;R?servation Request LIMITED;R?servation Requested Reserv? Requesting Reserve --- 787,794 ---- Replacement Price Prix Remplacement Reporter Reporter reports LIMITED;rapports ! Reports LIMITED;Rapports Request LIMITED;R?servation + request LIMITED;R?servation Requested Reserv? Requesting Reserve *************** *** 819,824 **** Ron Wickersham ***** Rosalie Blake, Head of Libraries ***** - Save Enregistrer save Enregistrer Save Changes Enregistrer changements School Ecole --- 814,819 ---- Ron Wickersham ***** Rosalie Blake, Head of Libraries ***** save Enregistrer + Save Enregistrer Save Changes Enregistrer changements School Ecole *************** *** 872,876 **** SELECTED>traducteur ***** Serial P?riodiques ! Series S?ries Series Title Titre S?ries Servers to query for MARC data serveurs ? interroger pour des donn?es MARC --- 867,871 ---- SELECTED>traducteur ***** Serial P?riodiques ! Series Titre p?riodique ou collection Series Title Titre S?ries Servers to query for MARC data serveurs ? interroger pour des donn?es MARC *************** *** 938,943 **** Tag LIMITED;Etiquette Teacher Reference R?f?rence Enseignant - test test Test Test Text messaging Ecriture d'un texte Text Messaging Ecriture d'un texte --- 933,938 ---- Tag LIMITED;Etiquette Teacher Reference R?f?rence Enseignant Test Test + test test Text messaging Ecriture d'un texte Text Messaging Ecriture d'un texte *************** *** 979,984 **** TITLE TITRE Title Search Recherche Titre - to ***** To LIMITED;? To "unmap", click ==> Pour "d?connecter" cliquer ==> To add a new biblio/item, scan or type the ISBN/ISSN number Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN. --- 974,979 ---- TITLE TITRE Title Search Recherche Titre To LIMITED;? + to ***** To "unmap", click ==> Pour "d?connecter" cliquer ==> To add a new biblio/item, scan or type the ISBN/ISSN number Pour ajouter une nouvelle notice ou un ouvrage, scannez ou saisissez l'ISBN ou l'ISSN. *************** *** 996,1001 **** Total Total TOTAL TOTAL - Total Due Total d? Total due Total d? Total Number of Items Nombre total d'ouvrages Total paid Total pay? --- 991,996 ---- Total Total TOTAL TOTAL Total due Total d? + Total Due Total d? Total Number of Items Nombre total d'ouvrages Total paid Total pay? *************** *** 1014,1019 **** unimarc_field_700_701_702.pl ***** Unititle Titre uniforme ! Update Mettre ? jour ! update mettre ? jour Update Member Details Mise ? jour du lecteur Update this Website Link Corriger ce lien Internet --- 1009,1014 ---- unimarc_field_700_701_702.pl ***** Unititle Titre uniforme ! update LIMITED;mettre ? jour ! Update LIMITED;Mettre ? jour Update Member Details Mise ? jour du lecteur Update this Website Link Corriger ce lien Internet *************** *** 1048,1053 **** Volume Description Description Volume Volume Info (for serials Info Volume (pour p?riodiques - WAITING EN ATTENTE Waiting En attente Website Site Web Website Biblioitem Added Notice site Web ajout?e --- 1043,1048 ---- Volume Description Description Volume Volume Info (for serials Info Volume (pour p?riodiques Waiting En attente + WAITING EN ATTENTE Website Site Web Website Biblioitem Added Notice site Web ajout?e *************** *** 1063,1068 **** Year Ann?e Yes Oui - yes oui YES OUI Yes, See below Oui, voir plus bas YesNo OuiNon --- 1058,1063 ---- Year Ann?e Yes Oui YES OUI + yes oui Yes, See below Oui, voir plus bas YesNo OuiNon *************** *** 1077,1082 **** You must create a new group for your item to be added to Vous devez cr?er un nouveau groupe pour ajouter vos ouvrages You must give the item a barcode Vous devez attribuer un code barre ? l'ouvrage - You searched for Votre recherche sur You Searched for Votre recherche sur You searched on Recherche effectu?e sur Young Adult Fiction Fiction Ados --- 1072,1077 ---- You must create a new group for your item to be added to Vous devez cr?er un nouveau groupe pour ajouter vos ouvrages You must give the item a barcode Vous devez attribuer un code barre ? l'ouvrage You Searched for Votre recherche sur + You searched for Votre recherche sur You searched on Recherche effectu?e sur Young Adult Fiction Fiction Ados Index: opac-css.fr =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac-css.fr,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** opac-css.fr 10 Feb 2004 09:02:53 -0000 1.1.2.5 --- opac-css.fr 19 Feb 2004 10:26:37 -0000 1.1.2.6 *************** *** 97,101 **** normal normal Normal or Normal ou ! Not Reservable Non r?servable Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used Notez que le mot clef est prioritaire Note there will be a reserve charge of Il y aura des frais de r?servation de --- 97,101 ---- normal normal Normal or Normal ou ! Not Reservable A consulter sur place Note that if you enter a value in Keyword and a value somewhere else, only keyword will be used Notez que le mot clef est prioritaire Note there will be a reserve charge of Il y aura des frais de r?servation de From oleonard at users.sourceforge.net Thu Feb 19 19:56:24 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:56:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27625/npl Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:57:10 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:57:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27745/en Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/acqui Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/acqui.simple Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/catalogue Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/includes Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/parameters Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/circ Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:11 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/user - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/user In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/user Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/user added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/marcimport - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/marcimport Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/reports Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/import - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/import Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:11 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/value_builder - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/value_builder Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/members Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:12 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/search.marc Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:12 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:12 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/z3950 - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/z3950 Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:58:09 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:58:09 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/export - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27914/export Log Message: Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export added to the repository From oleonard at users.sourceforge.net Thu Feb 19 19:59:39 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 10:59:39 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,NONE,1.1 acquire.tmpl,NONE,1.1 basket.tmpl,NONE,1.1 newbasket.tmpl,NONE,1.1 newbasket2.tmpl,NONE,1.1 newbiblio.tmpl,NONE,1.1 order.tmpl,NONE,1.1 recieve.tmpl,NONE,1.1 recieveorder.tmpl,NONE,1.1 supplier.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28315/koha-tmpl/intranet-tmpl/npl/en/acqui Added Files: acqui-home.tmpl acquire.tmpl basket.tmpl newbasket.tmpl newbasket2.tmpl newbiblio.tmpl order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl Log Message: New NPL templates --- NEW FILE ---

    Acquisitions

    Start, Recieve, or Modify Any Order
    Receive or Modify a Periodical Order
    Exchange Rates
    " name="" value="">
    Budgets and Bookfunds
    Budgets Total Spent Comtd Avail
    Total

    Use your reload button [ctrl + r] to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.

    Help

    To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).

    To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.

    To start a new shopping basket with a new supplier return to this page and just start a new supplier search.

    To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".

    --- NEW FILE ---

    Receipt Summary for : Invoice,

    • Invoice:
    • Received By:
    • Date:

    - Receive Order

    • Shopping Basket For:
    • Order placed:
    Catalogue Details
    Title * " >
    Author " >
    Copyright Date " >
    Format
    ISBN ">
    Series ">
    Branch
    Item Barcode * ">
    Volume Info (for serials) *
    "> "> "> "> "> "> &id=">Edit
    Accounting Details
    Bookfund *
    Quantity Ordered ">
    Quantity Received * ">
    Replacement Cost ">
    Budgeted Cost ">
    Actual Cost * ">
    Invoice Number ">
    Notes ">
    Basket ISBN Title Author Qty Received
    &biblio=&invoice=&freight=&gst=&id=">
    --- NEW FILE ---

    Shopping Basket for ">

    (Our Reference: , #, authorised by: )

    "> " /> " />
    Order Isbn Title Author $ rrp $est Qty Total
    &id=&basket=">
    HELP

    To change any of the catalogue or accounting information attached to an order, click on the title.

    		 SubTotal
    GST
    TOTAL

    " /> " /> Add order : enter keyword or title:

    --- NEW FILE --- Shopping Basket for
    (Our Reference: , #, authorised by: )
    Ph: , Fax:
    ,
    ,

    "> "> Search Keyword or Title:
    >
    Order Isbn Title Author Qty
    --- NEW FILE ---

    Shopping Basket For:

    &basket=&sub=">Add New Biblio &basket=&sub=">Add New Biblio | ">View Basket |
    " /> " /> New Search:

    You searched for

    --- NEW FILE ---
    --> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />

    - Order Details

    Shopping Basket For:

    ">View Basket
    Catalogue Details
    Title * " />
    Author " />
    Copyright Date " />
    Format
    ISBN ">
    Series ">
    Branch
    Accounting Details
    Quantity " onchange="update(this.form)" />
    Bookfund
    Suppliers List Price " onchange="update(this.form)" />
    Replacement Cost
    		" onchange="update(this.form)" />
    Budgeted Cost
    (ex GST, inc discount)     		" onchange="update(this.form)" />
    Budgeted GST
    BUDGETED TOTAL
    Actual Cost
    Invoice Number *
    Notes " />

    HELP

    • Bold fields must be filled in to create a new bibilo and item.

    • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.
    --- NEW FILE ---
    You searched on supplier , results found
    Supplier Search Results
    Order Receive Company
    Basket Items Staff Date
    /images/mail_send.png" title="Add order" ALT="Add" border="0" > /images/mail_get.png" title="receive" ALT="Add" border="0" >
    ">
    --- NEW FILE ---

    Receipt Summary for : , Invoice

    • Invoice:
    • Received By:
    • Date:
    " /> " /> " /> " /> Search ISBN or Title:
    Basket ISBN Title Author Actual P&P Qty Total
    &biblio=&invoice=&gst=&freight=&id="> $   $
          Subtotals $ $
    HELP

    The total at the bottom of the page should be within a few cents of the total for the invoice.

    When you have finished this invoice save the changes.

    		 GST $
      TOTAL $
    --- NEW FILE ---

    Receive Orders From Supplier

    " />
    Supplier Invoice Information
    Supplier Invoice Number
    GST
    Freight
    --- NEW FILE ---
    >

    Update:

    Add supplier

    Company Details
    " />
    " />
    " />
    " />
    Contact Details
    " />
    " />
    " />
    " />
    " />
    " />
    Current Status
    checked="checked" />Active checked="checked" />Inactive
    Ordering Information
    checked="checked" />Yes checked="checked" />No
    checked="checked" />Yes checked="checked" />No
    checked="checked" />Yes checked="checked" />No
    " /> %
    From oleonard at users.sourceforge.net Thu Feb 19 20:02:15 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:02:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,NONE,1.1 catalogue-home.tmpl,NONE,1.1 cmsdsearchresults.tmpl,NONE,1.1 detail-opac.tmpl,NONE,1.1 detail.tmpl,NONE,1.1 detailprint.tmpl,NONE,1.1 moredetail.tmpl,NONE,1.1 searchresults.tmpl,NONE,1.1 subject.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28745/koha-tmpl/intranet-tmpl/npl/en/catalogue Added Files: MARCdetail.tmpl catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl detailprint.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Log Message: New NPL templates --- NEW FILE --- --- NEW FILE ---

    Catalogue Search

    Search by Number

    Barcode
    ISBN

    Search by Details

    Keywords
    Title
    Author
    Collection
    Branch
    Pub Date(before) (after)
    Search TypeNormal Exact

    Search by Subject

    Subject
    --- NEW FILE --- Search Results
    TitleAuthorDewey
    &startfrom=>Previous Records &startfrom=>Next Records

    Results through of records.
    --- NEW FILE --- ()

    BIBLIO RECORD

    Subtitle:
    Author:
    Additional Author:
    Series Title:
    Subject:
    Copyright:
    Notes:
    Unititle:
    Serial:
    Total Number of Items:

    Item Type Class Location Date Due Last Seen
    Website Online Available &bib=&bi=">http://


    --- NEW FILE ---

    .jpg" alt="Book Cover Image" />

    ()

    Biblio Record

    " />
    " />" />" />" />
    " name="bib" />
    • Subtitle:
    • Author: ">
    • Additional Author:
    • ISBN:
    • Series Title:
    • Copyright:
    • Notes:
    • Unititle:
    • Serial:
    • Total Number of Items:
    • Subject: ">
      -->
    Item Type Call Number Location Date Due Last Seen Barcode
    "> -->  &item=&bib=&bi=#"> &item=">Fix Itemtype
    Website Online Available &bib=&bi=">http://

    Links to Associated Websites
    Title:
    Description:
    URL:">http://
    -->

    --- NEW FILE ---
      
    Biblio Record Number:
    Author:
    Additional Author:
    Publisher:
    Publication Details: , ,
    Collection:
    Subject:
    Copyright Date:
    Notes:
    Unititle:
    Dewey: ">
    Classification:
    LCCN:
    URL: ">
    ISBN:
    Item TypeBranchBarcode
    ,  
    --- NEW FILE ---

    ()

    Biblio Number:

    Category:

    " name="bib" />
    " />
    -->
    Bibliographic Details
    Biblionumber:
    Item Type:
    URL: -->
    Loan Length:
    Classification:
    ISBN:
    Publisher:
    Place:
    Date:
    Volume:
    Pages:
    Illus:
    Size:
    Notes:
    No. of Items:
    " id="">

    Barcode:

    Home Branch:
    Last seen:
    On loan to:
    Last borrowed:
    Last Borrower 1: ">
    Last Borrower 2: ">
    Current Branch:
    Replacement Price:
    &item=&type=">Item lost:
    Paid for:
    Notes:
    Renewals:
    &biblio=&invoice=&catview=yes"> Accession Date:
    Withdrawn:
    &bi=&itm=">Total Issues: 
    Group Number:
    Biblio number:
    --- NEW FILE ---

    You searched for You did not specify any seach criteria

     
    Results through of records.
    TitleAuthor©Call NumberItem CountLocation  
    opacintra&bib="> () &type=opacintra">          ">Reserves
    &=&type=opacintra"><<Prev   &=&type=opacintra">   &=&type=opacintra">Next >>  
    Results through of records. Try another search
    Try another search
    --- NEW FILE ---
    Results through of records.
    Subject
    opacintra&subjectitems=">
    "><< Previous Records &startfrom=">Next Records >>
    Results through of records.
    From oleonard at users.sourceforge.net Thu Feb 19 20:03:01 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:03:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,NONE,1.1 circulation.tmpl,NONE,1.1 returns.tmpl,NONE,1.1 selectbranchprinter.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28887/koha-tmpl/intranet-tmpl/npl/en/circ Added Files: branchtransfers.tmpl circulation.tmpl returns.tmpl selectbranchprinter.tmpl Log Message: New NPL templates --- NEW FILE --- Koha -- Circulation: Transfers

    Circulation: Transfers

    Reserve Found

    Reserve found for (" onclick="openWindow(this,'Member', 480, 640)">). Item is marked waiting at for (" onclick="openWindow(this,'Member', 480, 640)">).
    Set reserve to waiting and transfer book to : Cancel reservation and then attempt transfer:
    " value="" /> " value="" /> " value="" /> " /> " /> " />
    Cancel reservation and then attempt transfer:
    " value="" /> " value="" /> " value="" /> " /> " /> " /> />
    Ignore and return to transfers:
    /> " value="" /> " value="" /> " value="" />
    Messages
    Reserve Cancelled
    Item should now be waiting at branch:
    No Item with barcode: Please return item to home branch: Item is already at destination branch. Item was on loan to " onClick="openWindow(this,'Member', 480, 640)"> and has been returned.

    Transfer

    Destination Branch:
    Enter Book Barcode
    " /> " value="" /> " value="" /> " value="" />
    Transfered Items
    Bar CodeTitleAuthorTypeFromTo
    &type=intra" onclick="openWindow(this, 'Item', 480, 640)">
    --- NEW FILE ---

    Circulation: Issues

    Issuing Question

    Attempting to issue by to .

    " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />
    " /> " /> " /> " /> " /> " /> " /> " /> " /> " value="" />

    Error Issuing Book

    Add a new patron

    " /> " />

    Patron not found? Add a new patron

    " /> " />

    ()


    Reserves waiting:
    Notes:
    > Sticky Due Date --> " /> " /> " /> " />
    " />
    Issues ">(Print Page) ">(Print Slip)
    Due DateTitleAuthorCall NoBarcodeRenew?
    &type=intra"> " value="y" />
    &type=intra"> " value="y" />

    " />" value="y" />
    --- NEW FILE --- Koha -- Circulation: Returns:

    Reserve Found (item is already marked waiting)

    ">
    Patron:
    Transfer to:
    " value="" /> " value="" /> " value="" />

    Item marked Waiting:


    ">
    Patron:
    " value="" /> " value="" /> " value="" />
    ">
    Patron:
    Transfer to:
    " value="" /> " value="" /> " value="" /> " /> " /> " />

    Circulation: Returns

    " value="" /> " value="" /> " value="" />
    No Item with barcode: Please return to Not On Issue. Item was lost, now found. Item Cancelled
    Item InformationBorrower Information
    "> , ( , )
    Returned Items
    Due DateBar CodeTitleAuthorTypeBorrower
    // Not on Issue. &type=intra"> ">
    --- NEW FILE --- Koha -- Circulation: Select Your Home Branch

    Circulation: Select Your Home Branch

    From oleonard at users.sourceforge.net Thu Feb 19 20:06:48 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:06:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/export marc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/koha-tmpl/intranet-tmpl/npl/en/export Added Files: marc.tmpl Log Message: New NPL templates --- NEW FILE ---

    MARC Export

    Export in MARC format the following biblios:

    From biblio number: to biblio number:

    (leave blank to export every biblio)

    Note : the items are NOT exported by this tool

    From oleonard at users.sourceforge.net Thu Feb 19 20:08:20 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:08:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/import breeding.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29888/koha-tmpl/intranet-tmpl/npl/en/import Added Files: breeding.tmpl Log Message: New NPL templates --- NEW FILE ---

    MARC acquisition system

    Import into the breeding farm

    Import results :

    • imported records
    • not imported because already in DB
    • not imported because already in farm
    • not imported because they seems not to be MARC format (or ISBN/ISSN missing) !
    • records parsed
    • Back
    • 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.
    • If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.
    • You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!
    • Of course, if the ISBN already exists in the active DB, the biblio will be ignored.
    " enctype="multipart/form-data">

    If ISBN already in breeding farm: Ignore this one, keep the existing one
    Overwrite the existing one with this
    From oleonard at users.sourceforge.net Thu Feb 19 20:11:07 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:11:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes admin-topmenu.inc,NONE,1.1 circ-topmenu.inc,NONE,1.1 doc-head-circ-close.inc,NONE,1.1 doc-head-circ-open.inc,NONE,1.1 intranet-bottom.inc,NONE,1.1 intranet-nav-brief.inc,NONE,1.1 intranet-nav.inc,NONE,1.1 intranet-topmenu.inc,NONE,1.1 intranet.css,NONE,1.1 itemtypes.js,NONE,1.1 main-top-addbiblio.inc,NONE,1.1 main-top-blank.inc,NONE,1.1 main-top-circ.inc,NONE,1.1 main-top-print.inc,NONE,1.1 main-top.inc,NONE,1.1 masthead.inc,NONE,1.1 members-topmenu.inc,NONE,1.1 print.css,NONE,1.1 rollovers.js,NONE,1.1 tabs.css,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30391/koha-tmpl/intranet-tmpl/npl/en/includes Added Files: admin-topmenu.inc circ-topmenu.inc doc-head-circ-close.inc doc-head-circ-open.inc intranet-bottom.inc intranet-nav-brief.inc intranet-nav.inc intranet-topmenu.inc intranet.css itemtypes.js main-top-addbiblio.inc main-top-blank.inc main-top-circ.inc main-top-print.inc main-top.inc masthead.inc members-topmenu.inc print.css rollovers.js tabs.css Log Message: New NPL templates --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- --- NEW FILE --- </body> </html> --- NEW FILE --- <div id="nav"> <ul> <li><h4>Koha</h4></li> <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li> <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a> </li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li> <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Advanced Search</a></li> <li><a href="/cgi-bin/koha/search.marc/searchSH.pl?type=intranet">Thorough Search</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">MARC Search</a></li> </ul></li> <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a></li><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li> </ul> </div> --- NEW FILE --- <div id="nav"> <ul> <li><h4>Koha</h4></li> <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li> <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a> <form method="post" action="/cgi-bin/koha/circ/circulation.pl"> <label for="findborrower">Issue to:</label> <input id="findborrower" name="findborrower" type="text" size="10" /> <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /> <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input type="submit" class="submit" value="Submit" /> </form></li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a> </li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li> <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/member.pl" method="post"> <label for="member">Search:</label><input id="member" type="text" size="10" name="member" /> <input type="submit" value="Search" class="submit" /> </form></li></ul></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Catalog</a><ul><li><form action="/cgi-bin/koha/search.pl" method="post"> <label for="keyword">Quick Search:</label><input id="keyword" type="text" size="10" name="keyword" /> <input type="submit" value="Search" class="submit" /> </form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet">Advanced Search</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">MARC Search</a></li> </ul></li> <li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li></ul></li> <li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a> <ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul> </li> </ul> </div> --- NEW FILE --- <div id="topmenu"><form action="/cgi-bin/koha/member.pl" method="post"> <label for="member">Patron Search</label> <input type="text" id="member" name="member" value="" /> <input type="submit" class="submit" name="Go" value="Search" /></form><form action="/cgi-bin/koha/simpleredirect.pl" method="post"> <input type="submit" class="submit" value="Add New Patron" /> <input type="hidden" name="chooseform" value="adult" /> </form></div> --- NEW FILE --- a:link { color : #0066CC; } a:visited { color : #0066CC; } a:hover { color : #993300; } a.delete { background-color : #CC3333; color : #FFFF99; display : block; font-weight : bold; margin : 2px; padding : 1px; text-align : center; text-decoration : none; } a.delete:hover { background-color : #FF3333; color : #FFFF99; } a.edit { background-color : #CCFF00; color : #3366CC; display : block; font-weight : bold; margin : 2px; padding : 1px; text-align : center; text-decoration : none; } a.edit:hover { background-color : #CCFF99; color : #000088; } a:link.current { background-color : transparent; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:link.current { background-color : transparent; color : #3366CC; } a:link.nav { background-color : #D8DEB8; color : #3366CC; } a:link.pages { background-color : #FFFFCC; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:visited.current { background-color : transparent; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:visited.current { background-color : transparent; color : #3366CC; } a:visited.nav { background-color : #D8DEB8; color : #3366CC; } a:visited.pages { background-color : #FFFFCC; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:hover.current { background-color : #CCFF00; color : #CC3333; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:hover.current { background-color : #CCFF00; color : #CC3333; } a:hover.nav { background-color : #CCFF00; color : #CC3333; } a:hover.pages { background-color : #CCFF00; color : #CC3333; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:active.current { background-color : #99CC00; color : #FFFF99; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } a:active.current { background-color : #99CC00; color : #FFFF99; } a:active.nav { background-color : #99CC00; color : #FFFF99; } a:active.pages { background-color : #99CC00; color : #FFFF99; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } body { background-color : #009999; color : #333333; font-family : arial, geneva, sans-serif; font-size : 16px; margin : 3px 0px 0px 5px; } caption { color : #000066; font-size : 16px; font-weight : bold; margin-top : 5px; text-align : left; } div.form, div.details { background-color : #FFFFCC; border : 0px; margin : 0px auto; padding : 5px; width : 99%; } div.details { margin-bottom: 5px; width : 95%; } div.details dl { margin : 0px; padding : 0px; } div.details dt { font-weight: bold; font-size: 12px; border-bottom : 1px solid #D8DEB8; padding : 2px; } div.details dd { font-size: 12px; } div.details ul { margin-top: 0px; margin-bottom: 0px; padding-top : 0px; padding-bottom : 3px; font-size : 12px; } div.items { background-color : #FFFFCC; border : 0px; margin : 0px auto; padding : 5px; width : 100%; } div.items td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 1px solid #E7E7CA; border-top : 1px solid #E7E7CA; font-size : .75em; padding: 2px; } div.items th { background-color : #FFC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 1px solid #E7E7CA; color : #000088; font-size: .75em; font-weight : bold; padding : 2px; text-align : left; vertical-align : top; } div.details td, div.form td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; } div.details td:first-child, div.form td:first-child { font-weight : bold; text-align : right; width : 25%; } div.details td+td, div.form td+td { font-weight : normal; text-align : left; width : 75%; } div.compact td { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; font-weight : normal; font-size : 13px; padding : 1px 1px 1px 10px; } div.compact th { border-bottom : 1px solid #999933; border-left : 1px solid #E7E7CA; border-right : 1px solid #999933; border-top : 0px; padding : 1px 10px 1px 1px; font-weight : normal; font-size : 13px; text-align : right; width : 20%; vertical-align: top; } div.error { background-color : #FFFF99; border : 1px dashed #990000; font-size : 16px; line-height : 18px; margin : 10px auto; padding : 5px; width : 65%; } div.error .submit { background-color : #993300; font-size: 14px; color: #E7E7CA; padding : 2px 15px 2px 15px; } div.error h3 { color : #990033; } div.error p { margin : 0px; padding : 0px 0px 0px 20px; } div.notice { background-color : #FFFF99; border : 1px dashed #990000; font-size : 16px; line-height : 18px; margin : 10px auto; padding : 5px; } div.flags li { list-style : circle; } div.flags ul { margin : 0px; padding : 0px; } div.form { background-color : #FFFFCC; border : 0px dotted #333333; margin : 0px auto; padding : 5px; position : relative; } div.menu { width : 100%; } div.menu th { background-color : #FFFFCC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; font-size : 101%; font-weight : bold; text-align : right; } div.menu td+td { font-size : 90%; font-weight : normal; text-align : left; } div.tabitem { display : inline; } div.tabitem form { display : inline; white-space : nowrap; } div.tabitem ul li { margin-left: 0; margin-bottom: 0; padding: 2px 15px 5px; border: 1px solid #000; list-style: none; display: inline; } div.tabitem ul li.here { border-bottom: 1px solid #ffc; list-style: none; display: inline; } div.table, div.form { width : 100%; } fieldset { border : 0; padding : 0; white-space : nowrap; } fieldset.list { white-space : normal; } form { margin : 0px; padding : 0px; } h1 { color : #000066; font-size : 20px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h2 { color : #000066; font-size : 18px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3 { color : #000066; font-size : 16px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3.alert { background-color: #FFCC33; color: #CC0000; padding: 3px; } h4 { color : #000066; font-size : 14px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h5 { color : #000066; font-size : 13px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } h6 { color : #000066; font-size : 12px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } label { font-weight : bold; padding : 0px 5px 0px 5px; } table { background-color : #FFFFCC; border-bottom : 0px solid #000000; border-collapse : collapse; border-left : 0px solid #000000; margin : 3px 0px 5px 0px; padding : 0px; width : 99%; } td { border-bottom : 1px solid #E7E7CA; border-right : 1px solid #E7E7CA; font-size : 12px; padding : 5px 5px 5px 5px; } td:last-child { border-bottom : 1px solid #E7E7CA; border-right : 0px solid #E7E7CA; font-size : 12px; padding : 5px 5px 5px 5px; } td+ul { margin-top : 0px; margin-bottom : 0px; } th { background-color : #D8DEB8; border-bottom : 1px solid #000000; border-right : 1px solid #000000; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } th:last-child { background-color : #D8DEB8; border-bottom : 1px solid #000000; border-right : 0px solid #000000; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } td.input, div.form td, div.details td { border-bottom : 1px solid #E7E7CA; border-left : 0px; border-right : 0px; color : #000000; line-height : 1.5em; padding : 4px; text-align : right; } td.label, div.form th, div.details th { background-color : #FFC; border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; border-right : 0px; border-top : 0px; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; text-align : left; vertical-align : top; } td.label { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; } tr.highlight { background-color : #FFFFFF; } /*.barcode { display : block; text-align : right; font-style: italic; font-size : .95em; color: #666633; }*/ .cancel { background-color : #993300; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .current { background-color : #FFFFFF; color : #3366CC; font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } .error { color : #CC0033; font-weight : bold; } .ex { font-family : "Courier New", Courier, monospace; } .form dd { border-bottom : 1px solid #E7E7CA; color : #000000; display : block; line-height : 1.5em; padding : 4px; text-align : right; } .form dl { margin : 0px 0px 0px 0px; padding : 3px; width : 80%; } .form dt { border-bottom : 1px solid #E7E7CA; border-left : 1px solid #E7E7CA; color : #000088; float : left; font-weight : bold; line-height : 1.5em; padding : 4px; } .inline { display : inline; } .menu input { font-size : 80%; } input.focus { background-color: #FFF; border-bottom: 2px dashed #993300; } input.unfocus { background-color : #FFF; } .nav { font-size : 12px; font-weight : bold; padding : 1px 5px 1px 5px; text-decoration : none; } .print { font-size: 10px; } .submit { background-color : #669999; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .yes { float: left; padding : 0px 15px 0px 15px; width : 33%; margin : 0px 2px 0px 2px; text-align: center; } .no { float: right; padding : 0px 15px 0px 15px; width : 33%; margin : 0px 2px 0px 2px; text-align: center; } #main { background-color : #CCCC99; border-left : 1px solid #CCCC99; margin-left : 20%; margin-right : 2%; margin-top : 2%; padding : 10px; position : relative; } #menu { background-color : #FFFFCC; } #menu dd { border-bottom : 1px dashed #D8DEB8; border-left : 1px dashed #D8DEB8; border-right : 0px solid #000000; border-top : 0px solid #000000; padding : 3px 45px 3px 10px; } #menu dd a { font-size : 1.05em; font-weight : bold; text-decoration : none; } #menu dd li { display : inline; white-space : nowrap; } #menu dd li:before { content : "\00BB \0020"; } #menu dd ul { display : inline; list-style : disc; } #menu dl { margin : 0px; padding : 0px; /*width : 80%;*/ } #menu dt { background-color : #FFFFFF; border-bottom : 1px solid #D8DEB8; border-left : 0px solid #D8DEB8; border-right : 0px solid #000000; border-top : 0px solid #000000; color : #000066; font-size : 1.2em; font-weight : bold; padding : 2px 2px 2px 5px; } #menu dt a { text-decoration : none; } #nav { background-color : #CCCC99; float : left; margin : 2% 0% 0% 1%; padding : 0px; width : 15%; } #nav .submit { font-size : 9px; } #nav a { font-family : Tahoma, arial, geneva, sans-serif; font-weight : bold; text-decoration : none; } #nav h4 { font-size : 12px; font-weight : bold; margin : 0px; padding : 0px; text-align : left; } #nav input { font-size : .8em; } #nav label { font-size : 10px; } #nav ul { margin : 0px; padding : 0px; } #nav ul li { background-color : #D8DEB8; border-bottom : 1px solid #FFFFCC; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; border-top : 0px solid #FFFFCC; font-size : .8em; list-style : none; padding : 3px; text-align : right; width : 100%; } #nav ul li+li { border-bottom : 1px solid #FFFFCC; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; } #nav ul ul { margin : 0px 0px 0px 5px; } #nav ul ul li { background-color : #EFF1D8; border-bottom : 1px solid #CCCC99; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; border-top : 0px solid #FFFFCC; font-size : .9em; list-style : none; margin : 0px 0px 0px 0px; padding : 0px 0px 0px 0px; text-align : right; width : 100%; } #nav ul ul li+li { border-bottom : 1px solid #CCCC99; border-left : 0px solid #FFFFCC; border-right : 0px solid #006699; padding : 0px 0px 0px 0px; } #notes { float : right; margin : 0px; font-size : 12px; } #notes ul { margin : 0px; padding : 0px; } #results, .results { color : #000066; font-family : Verdana, Geneva, Arial, Helvetica, sans-serif; font-size : .8em; margin : 0px; padding : 3px 0px 15px 0px; } #topmenu { color : #CCCC99; margin-bottom : 5px; margin-left : 20px; margin-right : 10px; } #topmenu .submit { background-color : #999933; color : #FFFFCC; font-size : .7em; padding : 2px; } #topmenu a:link { color : #CCFF66; font-weight : bold; padding : 2px; } #topmenu a:visited { color : #CCFF66; font-weight : bold; padding : 2px; } #topmenu a:hover { color : #FFFFCC; font-weight : bold; padding : 2px; } #topmenu a:active { color : #FFFFCC; font-weight : bold; padding : 2px; } #topmenu form { display : inline; } #topmenu label { font-weight : bold; } --- NEW FILE --- <script language="JavaScript" type="text/javascript"> // function isNotNull(f,noalert) { if (f.value.length ==0) { return false; } return true; } // function toUC(f) { var x=f.value.toUpperCase(); f.value=x; return true; } // function isNum(v,maybenull) { var n = new Number(v.value); if (isNaN(n)) { return false; } if (maybenull==0 && v.value=='') { return false; } return true; } // function isDate(f) { var t = Date.parse(f.value); if (isNaN(t)) { return false; } } // function Check(f) { var ok=1; var _alertString=""; var alertString2; if (f.itemtype.value.length==0) { _alertString += "- itemtype missing\n"; } if (!(isNotNull(window.document.Aform.description,1))) { _alertString += "- description missing\n"; } if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) { _alertString += "- loan length is not a number\n"; } if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) { _alertString += "- rental charge is not a number\n"; } if (_alertString.length==0) { document.Aform.submit(); } else { alertString2 = "Form not submitted because of the following problem(s)\n"; alertString2 += "------------------------------------------------------------------------------------\n\n"; alertString2 += _alertString; alert(alertString2); } } </script> --- NEW FILE --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE --- Athens County Library Services -- Koha Intranet --- NEW FILE ---

    Koha Intranet:

    --- NEW FILE ---
    Patrons Home |
     
    --- NEW FILE --- a:link { color : #000066; text-decoration: none; } a:visited { color : #000066; text-decoration: none; } a:hover { color : #993300; text-decoration: none; } body { background-color : #FFF; color : #333333; font-family : arial, geneva, sans-serif; font-size : 14px; margin : 0px 0px 0px 0px; } caption { color : #000066; font-size : 18px; font-weight : bold; margin-top : 5px; text-align : left; } div.table { width : 100%; } form { margin : 0px; padding : 0px; } h1 { color : #000066; font-size : 22px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h2 { color : #000066; font-size : 20px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h3 { color : #000066; font-size : 18px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h4 { color : #000066; font-size : 16px; font-weight : bold; margin-bottom : 3px; margin-top : 3px; } h5 { color : #000066; font-size : 15px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } h6 { color : #000066; font-size : 14px; font-weight : bold; margin-bottom : 1px; margin-top : 1px; } table, table.list { background-color : #FFFFFF; border-bottom : 0px solid #CCCCCC; border-collapse : collapse; border-left : 0px solid #CCCCCC; margin : 3px 0px 5px 0px; padding : 0px; width : 99%; } td { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-right : 1px solid #CCCCCC; font-size : 12px; padding : 5px 5px 5px 5px; } td:last-child { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-right : 0px solid #CCCCCC; font-size : 12px; padding : 5px 5px 5px 5px; } table.list th { background-color : #FFFFFF; text-align: left; font-size: 12px; font-weight: bold; padding: 5px; width : 25%; } th { background-color : #E9E9E9; border-bottom : 1px solid #CCCCCC; border-right : 1px solid #CCCCCC; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } th:last-child { background-color : #E9E9E9; border-bottom : 1px solid #CCCCCC; border-right : 0px solid #CCCCCC; font-size : 14px; font-weight : bold; padding : 5px 5px 5px 5px; } td.input, div.form td, div.details td { border-bottom : 1px solid #CCCCCC; border-left : 0px; border-right : 0px; color : #000000; line-height : 1.5em; padding : 4px; text-align : left; } td.label, div.form th, div.details th { background-color : #FFF; border-bottom : 1px solid #CCCCCC; border-left : 1px solid #CCCCCC; border-right : 0px; border-top : 0px; color : #000088; font-weight : bold; line-height : 1.5em; padding : 4px; text-align : right; vertical-align : top; } tr.highlight { background-color: #CCCCCC; } .cancel { background-color : #993300; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } .error { font-weight: bold; } .ex { font-family : "Courier New", Courier, monospace; } .inline { display : inline; } .print { display : none; } .submit { background-color : #669999; color : #FFFFCC; font-size : 12px; font-weight : bold; padding : 2px; } #main { background-color : #FFF; border-left : 0px solid #CCCC99; margin-left : 2%; margin-right : 2%; margin-top : 1%; padding : 5px; position : relative; } --- NEW FILE --- if (document.images) { home0 = new Image(); home0.src = "/intranet-tmpl/npl/en/images/home0.gif"; library0 = new Image(); library0.src = "/intranet-tmpl/npl/en/images/library0.gif"; kids0 = new Image(); kids0.src = "/intranet-tmpl/npl/en/images/kids0.gif"; teens0 = new Image(); teens0.src = "/intranet-tmpl/npl/en/images/teens0.gif"; readers0 = new Image(); readers0.src = "/intranet-tmpl/npl/en/images/readers0.gif"; search0 = new Image(); search0.src = "/intranet-tmpl/npl/en/images/search0.gif"; branch0 = new Image(); branch0.src = "/intranet-tmpl/npl/en/images/branch0.gif"; programs0 = new Image(); programs0.src = "/intranet-tmpl/npl/en/images/programs0.gif"; mobile0 = new Image(); mobile0.src = "/intranet-tmpl/npl/en/images/mobile0.gif"; OPLIN0 = new Image(); OPLIN0.src = "/intranet-tmpl/npl/en/images/OPLIN0.gif"; contact0 = new Image(); contact0.src = "/intranet-tmpl/npl/en/images/contact0.gif"; home1 = new Image(); home1.src = "/intranet-tmpl/npl/en/images/home1.gif"; library1 = new Image(); library1.src = "/intranet-tmpl/npl/en/images/library1.gif"; kids1 = new Image(); kids1.src = "/intranet-tmpl/npl/en/images/kids1.gif"; teens1 = new Image(); teens1.src = "/intranet-tmpl/npl/en/images/teens1.gif"; readers1 = new Image(); readers1.src = "/intranet-tmpl/npl/en/images/readers1.gif"; search1 = new Image(); search1.src = "/intranet-tmpl/npl/en/images/search1.gif";; branch1 = new Image(); branch1.src = "/intranet-tmpl/npl/en/images/branch1.gif"; programs1 = new Image(); programs1.src = "/intranet-tmpl/npl/en/images/programs1.gif"; mobile1 = new Image(); mobile1.src = "/intranet-tmpl/npl/en/images/mobile1.gif"; OPLIN1 = new Image(); OPLIN1.src = "/intranet-tmpl/npl/en/images/OPLIN1.gif"; contact1 = new Image(); contact1.src = "/intranet-tmpl/npl/en/images/contact1.gif"; } // Function to 'activate' images. function imgOn(imgName) { if (document.images) { document[imgName].src = eval(imgName + "0.src"); } } // Function to 'deactivate' images. function imgOff(imgName) { if (document.images) { document[imgName].src = eval(imgName + "1.src"); } } --- NEW FILE --- .contentholder { position: relative; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; } .tabholder { margin-top : 5px; padding: 0; position: relative; z-index: 2; } .tab { border: 2px; border-color: #999999; border-bottom-style: none; line-height: 150%; text-align: center; padding: 4px 10px 4px 10px; margin: 0; cursor: pointer; cursor: hand; font-family: Arial, Helvetica, sans-serif; font-size: 12px; font-weight: bold; background-color: #D8DEB8; color: #000066; } .panelholder { position: relative; top: 3px; z-index: 1; width: 100%; visibility: visible; display: block; } .panel { position: relative; color: #000000; background-color: #FFFFCC; border: 2px; border-color: #999999; top: 0; left: 0; padding: 10px; display: none; } From oleonard at users.sourceforge.net Thu Feb 19 20:11:58 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:11:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/marcimport AcceptBiblioitem.tmpl,NONE,1.1 AcceptItemCopy.tmpl,NONE,1.1 AcceptMarcUpload.tmpl,NONE,1.1 ListFileRecords.tmpl,NONE,1.1 mainmenu.tmpl,NONE,1.1 marcimportdetail.tmpl,NONE,1.1 uploadmarc.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30588/koha-tmpl/intranet-tmpl/npl/en/marcimport Added Files: AcceptBiblioitem.tmpl AcceptItemCopy.tmpl AcceptMarcUpload.tmpl ListFileRecords.tmpl mainmenu.tmpl marcimportdetail.tmpl uploadmarc.tmpl Log Message: New NPL templates --- NEW FILE ---
    New Record | New File
    Record already in database
    is already in the database with biblionumber and biblioitemnumber

    Record entered into database
    has been entered into the database with biblionumber and biblioitemnumber
    Add a New Item for
    "> "> ">
    BARCODE"> Home Branch:
    Replacement Price:
    Notes

    --- NEW FILE ---

    Barcode '' has already been assigned.

    Error :

    Item added with barcode

    Main Menu

    --- NEW FILE ---

    >Main Menu

    Select a set of MARC records

    \n

    Upload a set of MARC records
    Upload a set of MARC records:
    ?menu=" enctype="multipart/form-data">
    Name this set of MARC records:
    --- NEW FILE ---

    Main Menu

    Select a New File

    Select a Record to Import from
    > " [Viewing to of records] |
    Search still pending... processing... No results found for query ?file=&resultsid=&=&searchfield=&searchvalue=> --> ?file=&numrecord=>
    --- NEW FILE ---

    Main Menu

    --- NEW FILE --- > ()

    New Record

    Full MARC Record available at bottom
    Title" size=40 maxlenght=255>
    Subtitle" size=40 maxlenght=255>
    Author" size=40 maxlenght=255>
    Additional authors
    Illustrator" size=40 maxlenght=255>
    Copyright" size="20" maxlenght=80>
    Series Title" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Number" size=40 maxlenght=255>
    Volume Date" size=40 maxlenght=255>
    Volume Description" size=40 maxlenght=255>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item Type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    LCCN" size=40 maxlenght=40>
    Dewey" size=8 maxlenght=10>
    Subclass" size=40 maxlenght=40>
    Publication Year" size=5 maxlenght=10>
    Publisher" size=40 maxlenght=255>
    Place" size=40 maxlenght=255>
    Pages" size=5 maxlenght=10>
    Size" size=40 maxlenght=40>
    "> "> "> "> --> "> "> ">
    MARC RECORD
          "> 
    --- NEW FILE ---

    >Main Menu

    Select a set of MARC records

    Upload a set of MARC records
    Upload a set of MARC records:
    ?menu=" enctype="multipart/form-data">
    > Name this set of MARC records:
    From oleonard at users.sourceforge.net Thu Feb 19 20:12:45 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:12:45 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members imemberentry.tmpl,NONE,1.1 jmemberentry.tmpl,NONE,1.1 member-password.tmpl,NONE,1.1 member.tmpl,NONE,1.1 memberentry.tmpl,NONE,1.1 members-home.tmpl,NONE,1.1 moremember.tmpl,NONE,1.1 pay.tmpl,NONE,1.1 readingrec.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30848/koha-tmpl/intranet-tmpl/npl/en/members Added Files: imemberentry.tmpl jmemberentry.tmpl member-password.tmpl member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl pay.tmpl readingrec.tmpl Log Message: New NPL templates --- NEW FILE ---

    Edit Institution

    Add New Institution

    " />
    " />
    " />
    " />
    " />
    Contact Details
    " />
    " />
    " />
    " />
    Institution Details
    " />

    --- NEW FILE ---
    " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " />

    Add New Juvenile Patron

    Parent or Guardian
    " />
    " />
    " size="20" > -->
    Child
    " name="cardnumber_child_" size="20" value="" />" value="" />
    " name="firstname_child_" size="20" />
    " name="surname_child_" size="20" />
    " id="dateofbirth_child_" size="10" />
    " name="sex_child_" value="F" />F " value="M" />M

    --- NEW FILE ---

    Password Updated

    ">Return to Member Details

    ">

    Change Username and/or Password for

    You have entered a User ID that already exists. Please choose another one.
    New UserID:" />
    New Password:" />

    '; return false;" />

    --- NEW FILE ---
    -->
    Patron Search Results
    Card Name Cat Address OD/Issues Notes
    (" title="Issue to this Patron">ISS) ">,
    No results found
    --- NEW FILE ---

    :

    ,

    " /> checked="checked" />F checked="checked" /> M
    " /> " /> ()
    " />
    " />
    " size="20" />
    " />
    " />
    " />
    " />
    Alternate Contact
    " />
    " />
    Flags
    " name="" value="1" />Yes " name="" value="0" />No
    Patron Details
    " maxlength="7" /> " /> " /> " /> " />

    " />UpdateAdd This Member" /> '; return false;" />

    --- NEW FILE ---

    Patrons

    --- NEW FILE ---

    ()

    " />" />" />
    " />
    " />
    " />
    " />
    Name: ,
    Address:
    ,
    Permanent Address:
    ,
    Home Phone:  
    Work Phone:
    Fax:
    E-mail:">
    Text messaging:
    Date of Birth: 
    Sex: 
    Member Number:
    Category:
    Registration Date:,  
    Expiration Date 
    Registration Branch:
    Ethnicity:,
    General Notes:

    Alternate Contact:
    • Name:
    • Phone:
    • Relationship:
    • Notes:
    Guarantees: 
    Guarantor: ">
    No guarantor
    Fines & Charges
    &bib=&bi=">  
    ">View Account ">Pay Fines
    " />
    -->
    Items On Loan
    Title Due Itemtype Renew Return
    &bib=&bi="> ">Reserved " value="y" /> ">Return

    " />" value="y" />
    " /> " />
    Reserves
    Title Requested Remove
    ">

    Reading Record
    ">View Patron's Reading Record
    --- NEW FILE ---
    " />
    Pay Fines for
    Fines & Charges Description Account Type Amount Amount Outstanding
    " type="radio" name="payfine" value="no" checked="checked" />
    " name="payfine" value="yes" />
    " name="payfine" value="wo" />
    " value="" /> " value="" /> " value="" /> " value="" /> " value="" /> " value="" />
    Total Due
    " name="bornum" />
    --- NEW FILE --- From oleonard at users.sourceforge.net Thu Feb 19 20:15:19 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:15:19 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports reports-home.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31482/koha-tmpl/intranet-tmpl/npl/en/reports Added Files: reports-home.tmpl Log Message: New NPL templates --- NEW FILE ---

    Reports

    From oleonard at users.sourceforge.net Thu Feb 19 20:16:52 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:16:52 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc result.tmpl,NONE,1.1 search.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/koha-tmpl/intranet-tmpl/npl/en/search.marc Added Files: result.tmpl search.tmpl Log Message: New NPL templates --- NEW FILE --- --- NEW FILE ---

    Advanced MARC Search

    " />
    Help:

    Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search. Search commits the request and displays the results.
      value="" />
    Results per page :
    From oleonard at users.sourceforge.net Thu Feb 19 20:19:58 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:19:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/value_builder unimarc_field_100.tmpl,NONE,1.1 unimarc_field_105.tmpl,NONE,1.1 unimarc_field_225a.tmpl,NONE,1.1 unimarc_field_60X.tmpl,NONE,1.1 unimarc_field_700-4.tmpl,NONE,1.1 unimarc_field_700_701_702.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32499/koha-tmpl/intranet-tmpl/npl/en/value_builder Added Files: unimarc_field_100.tmpl unimarc_field_105.tmpl unimarc_field_225a.tmpl unimarc_field_60X.tmpl unimarc_field_700-4.tmpl unimarc_field_700_701_702.tmpl Log Message: New NPL templates --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Ann?e d?but ">
    Ann?e fin ">
    --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Ann?e d?but ">
    Ann?e fin ">
    --- NEW FILE --- UNIMARC Field 225a builder
    Select a collection
    --- NEW FILE --- Thesaurus search

    Recherche

    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
    "> "> ">

    Results

    &level=&search_string="> ')">

    Dependancies

    &level=&search_string=+"> ')">

    Adding

    "> "> Create a new authority/thesaurus entry : ">
    --- NEW FILE --- UNIMARC constructeur champ 700-4

    S?lectionnez la valeur pour le champ 700 $4. Elle sera automatiquement report?e dans la zone 700 $8 qui suit.

    Code date publication
    --- NEW FILE --- Personal Authorities builder

    "> "> "> "> "> ">

    "> ">
    "> insert a new authority : ">
    From oleonard at users.sourceforge.net Thu Feb 19 20:21:25 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:21:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/z3950 searchresult.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv346/koha-tmpl/intranet-tmpl/npl/en/z3950 Added Files: searchresult.tmpl Log Message: New NPL templates --- NEW FILE --- ">

    Z3950 Search Results

    ">
    Bibliographic Records Found
    Title Author ISBN coming from    
    )">Import this biblio
    Nothing found

    Still requests to go

    From oleonard at users.sourceforge.net Thu Feb 19 20:01:06 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:01:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio-nomarc.tmpl,NONE,1.1 addbiblio.tmpl,NONE,1.1 addbooks.tmpl,NONE,1.1 additem-nomarc.tmpl,NONE,1.1 additem.tmpl,NONE,1.1 isbnsearch.tmpl,NONE,1.1 marcimport.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28575/koha-tmpl/intranet-tmpl/npl/en/acqui.simple Added Files: addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl additem.tmpl isbnsearch.tmpl marcimport.tmpl Log Message: New NPL templates --- NEW FILE --- Adding a new Biblio
    Section One: Copyright Information

     

    Please Specify a Title
    Title: *
    Subtitle:
    Author:
    Series Title:
    (if applicable)
    Copyright Date:
    Abstract:
    Notes:
    * Required --- NEW FILE ---
    " />

    Edit MARC Record Number Add MARC Record

    Save Bibliographic Record and Go To ItemsAdd Bibliographic Record and Go To Items" onclick="Check(this.form);" class="submit" accesskey="w" />
    007-130 240-490 500-586 600-655 700-856 942
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
    " />" /> - )">+
      * " /> " /> " /> " /> " />
      * " /> " /> " /> " /> " />
    " /> " /> " /> " /> " /> " /> " /> " /> " />
    --- NEW FILE ---

    Catalog Maintenance

     

    No items found

     

    Website Biblioitem Added " />
    Create Brief Record

    -->

    Search Existing Records

    • If the ISBN is found into the biblio table, it will be retrieved and can be modified.
    • If the ISBN is found into the breeding farm, it will be retrieved, and a biblio added.
    • Otherwise, a biblio can be added from scratch.


    Add New Website
    --- NEW FILE --- test

    You must give the item a barcode

    You must create a new group for your item to be added to

    Sorry, that barcode is already in use

    BIBLIO RECORD
    Author:
    Copyright:
    Series Title:
    Notes:
    GROUP -
    URL:
    Date:
    Notes:
    GROUP -
    ISBN:
    Dewey:
    Publisher:
    Place:
    Date:
    Item:
    Home Branch:
    Notes:

    ">
    ADD NEW ITEM:
    For a website add the group only
    Item Barcode:
    Branch:
    Replacement Price:
    Notes:
    Add to existing group:
    Group:
    OR Add to a new Group:
    Format:
    ISBN:
    Publisher:
    Publication Year:
    Place of Publication:
    Illustrator:
    Additional Authors:
    One Author per line
    Subject Headings:
    One Subject per line
    Website URL:
    Dewey:
    Dewey Subclass:
    ISSN:
    LCCN:
    Volume:
    Number:
    Volume Description:
    Pages:
    Size:
    Notes:
    --- NEW FILE ---

    Items for Bibliographic Record

    ">
    ">
    Existing Items
     
    &itemnum=">Edit
    ERROR: Barcode already exists!

    Add New ItemUpdate Item

    "> ">
    * "> "> ">
    "> "> "> ">
    --- NEW FILE ---

    Biblio Search Results for ISBN title

    results found
    Results to displayed
    Existing Bibliographic Records
    Title Author © Call Number  
    ">   ">Edit Biblio">Edit Items
    Nothing found
    Bibliographic Records in the Breeding Farm
    Title Author ISBN coming from    
    ">Add biblio
    Nothing found
    " name="isbn" />
    --- NEW FILE ---
    " enctype="multipart/form-data">

    MARC acquisition system

    Import into breeding farm

    Import results :

      imported records

      not imported because already in DB

      not imported because already in farm

      not imported because they seems not to be MARC format (or ISBN/ISSN missing) !

      records parsed

      Back to acquisition

    • Select a file to import into breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in breeding farm. If an ISBN already exists in the breeding farm, you can choose wether to ignore the new one, or overwrite the old one.
    • You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested marc data comes !
    • Of course, if the ISBN already exists in active DB, the biblio will be ignored.
    Select the file to import :
    Name of this import :
    If ISBN already in breeding farm : Ignore this one, keep the existing one
    Overwrite the existing one with this
    From oleonard at users.sourceforge.net Thu Feb 19 20:14:38 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:14:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,NONE,1.1 aqbookfund.tmpl,NONE,1.1 aqbudget.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 categorie.tmpl,NONE,1.1 categoryitem.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,NONE,1.1 itemtypes.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 printers.tmpl,NONE,1.1 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 thesaurus.tmpl,NONE,1.1 z3950servers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31268/koha-tmpl/intranet-tmpl/npl/en/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: New NPL templates --- NEW FILE ---

    Koha Admin Page

    Parameters

    Biblio related
    Item types the supports of an item.
    Budget The monies allocated to your book funds.
    Book Funds Book fund administration. Remember to edit your book funds before you start editing the budgets.
    Authorised Values Define here categories and authorised values for them. Authorised values are used in MARC form to limit/help editing MARC biblios
    Thesaurus Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"
    MARC related
    MARC tag structureMARC structure : tag then subfields
    Links koha - MARC DBDefine links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage
    Checks MARCChecks the MARC structure. USE IT before working with real datas. It will show mistakes that BREAKS koha database!
    Various parameters
    Library Branches the differents branches you manage with this Koha server
    Borrower Categories the differents types of borrowers.
    Currencies Currencies of booksellers.
    Printers Printers (UNIX paths).
    Stop Words Words deleted during searches
    Z39.50 Servers Servers to query for MARC data
    System Preferences System preferences

    Tools

    Import/Export
    MARC biblio export Exporting in MARC format
    Upload MARC records in Breeding Farm The breeding farm is a table where imported MARC records are stored.
    A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. If it is found, the biblio is added to Koha active table and removed from the breeding farm.
    --- NEW FILE ---

    Bookfund Administration

    You Searched for
    Book fund Name Edit Delete
    ?op=add_form&bookfundid= "> ?op=add_form&bookfundid= ">Edit ?op=delete_confirm&bookfundid=">Delete
      Budget ">Add Budget
      - : ">Edit ">Delete

    " name="Aform" method="post">
    Book fund" />
    Book fund
    Name" />

    '; return false;" />

    Data Recorded

    " method="post">

    Confirm Deletion of Fund

    Book fund
    Name
    Group
    " method="post">" />
    " method="post">

    Data Deleted

    " method="post">
    --- NEW FILE ---

    Budget admin

    You Searched for
    Book fundStart dateEnd dateBudget amount 
    () ">Edit ">Delete

    Book fund" />
    Book fund name
    Bookfund" />
    Start date ()" /> 
    End date ()" />
    Budget amount" />
    " />

    Budget Data Recorded

    " method="post">

    Delete Book Fund ''?

    Start date
    End date
    budgetamount
    " method="post">" />
    " method="post">

    Book fund deleted

    " method="post">
    --- NEW FILE ---
    " name="Aform" method="post">

    Category
    Authorised value " />
    Lib " />

    " />

    Confirm Deletion

    Variable Lib
    Value
    " method="post"> " /> " />
    " method="post">

    Authorised values admin

    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.

    When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio, the subfield is not entered through a free field, but though a list of authorised values

    Category Authorised value Lib Edit Delete
    "> ">Edit ">Delete
    " method="post"> " />
    --- NEW FILE ---

    " name="Aform" method="post">
    Branch code " /> " />
    Name " /> 
    " />
    Address " />
      " />
      " />
    Phone " />
    Fax " />
    E-mail " />

    Confirm of Branch :

    " method="post"> " />
    " method="post">
    Name Code Address Category    
    (nothing entered)


    Ph:
    Fax:
    Email:     		(no categories set)
    " />
    " />

    Branches Categories
    Name Code Description    
    " />
    " />
    " method="post">

    Category code " /> " />
    Name " /> 
    Description " /> 
    Confirm delete:
    " />
    " method="post">
    --- NEW FILE ---
    " name="Aform" method="post">

    Modify category

    Add category

    Category code " />
    Category code
    Description
    Enrolment period years
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrollment fee
    Overdue notice required" />
    Issue limit" />
    Reserve fee" />

    Update CategoryAdd Category" onclick="Check(this.form);" /> '; return false;" />

    Data recorded

    " method="post">

    Confirm Deletion of Category

    Patrons with Category '':

    Category code
    Description
    Enrolment period
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee

    This category is used times. Deletion not possible

    " method="post"> " />
    " method="post">
    " method="post"> " />
    " method="post">

    Category Deleted

    " method="post">

    Patron Category Administration

    You Searched for
    " method="post"> " />
    --> --> -->
    Category Description Enrollment Upper Age Limit Age Required Bulk Overdue Issue Limit  
    ?op=add_form&categorycode=">Edit ">Delete
    " method="post">
    --- NEW FILE ---

    Modify category

    Add category

    " name="Aform" method="post">
    Category code ">
    Category code
    Description ">  
    Enrolment period ">
    Upperage limit ">
    Age Required ">
    Fine type ">
    Bulk ">
    Enrolment fee ">
    Overdue notice required ">
    Issue limit ">
    Reserve fee ">
     
    Data recorded " method="post">
    TOTAL : :
    "> data deleted

    Category admin

    You Searched for " method="post">
    Category code
    Description
    Enrolment period
    Upperage limit
    Age Required
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee
    This record is used times. Deletion not possible
    " method="post">
    CONFIRM DELETION
    ">
    Category Description Enrolment Upper Age Limit Age Required Fine Bulk Fee Overdue Issue Limit Reserve    
    ?op=add_form&categorycode=">Edit ?op=delete_confirm&categorycode=">Delete

    " method="post">

    --- NEW FILE ---

    Calculating Fines

    Each box needs to be filled in with fine,time to start charging,charging cycle

    eg 1,7,7 = $1 fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night

     
    "> " value="" size="6" maxlength="10">
    --- NEW FILE ---

    MARC Checks

    Test Result
    itemnum
    • The field itemnum MUST be mapped
    • The correspounding subfield MUST be in with -1 (ignore) tab
    OK itemnum : the field itemnumber is mapped to a field in tab -1
    item fields ALL items fields MUST :
    • be mapped to the same tag,
    • and they must all be in the 10 (items) tab
    OK All item fields are in the same tag and in item tab
    itemtype NOT mapped the biblioitems.itemtype field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised_value=itemtype
    OK biblioitems.itemtype defined
    homebranch NOT mapped the items.homebranch field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised value=branches
    OK homebranch defined
    holdingbranch NOT mapped the items.holdingbranch field MUST :
    • be mapped to a MARC subfield,
    • the correspounding subfield MUST have authorised value=branches
    OK holdingbranch defined
    biblio and biblionumber The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
    • be mapped to a MARC subfield,
    • be in the SAME tag (for example : 090$a and 090$b)
    • be in tab -1
    OK biblionumber and biblioitemnumber mapped correctly
    TOTAL You have error(s) in your MARC configuration. Please fix them before using Koha

    Configuration OK, you don't have errors in your MARC parameters table

    --- NEW FILE ---
    Modify currency Add currency
    Currency " />
    Currency
    Rate " />
    '; return false;" />

    Data Recorded

    " method="post">
    Confirm Deletion of Currency
    Currency
    Rate
    This currency is used times. Deletion not possible
    " method="post">
    " />
    " method="post">

    Currency Deleted

    " method="post">

    Currencies admin

    You searched for
    Currency Rate  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    ?offset="><< Prev ?offset=">Next >>
    --- NEW FILE ---
    " name="Aform" method="post">
    Modify item type Add item type
    Item type" />
    Item type
    Description " /> 
    Not for loan checked="checked" value="1"> (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)
    Loan length "> (meaningful only if not for loan is not set)
    Renewals allowed? checked="checked" value="1" />
    Rental charge " />
    -->
    Cannot Delete Item TypeDelete Item Type ''?
    Item type
    Description
    Loan length
    RenewalsAllowedNot allowed
    " method="post"> " />
    This record is used times. Deletion is not possible.
    " method="post">
    " method="post">
    -->
    Item Types Administration
    Code Description Loan Length Renewable Edit Delete
    ?op=add_form&itemtype="> YesNo ?op=add_form&itemtype=">Edit ?op=delete_confirm&itemtype=">Delete
    " method="post">

    '; return false;" value="<< Previous Page" /> '; return false;" value="Next Page >>" />

    --- NEW FILE ---

    Choose and validate 1 of the following for .

    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " method="post"> " /> " />
    " name="Aform" method="post"> " /> " />

    MARC links

    " method="post">

    Koha Field Tag Subfield Lib
    "> ">Edit
    --- NEW FILE ---
    " name="Aform" method="post">

    Field Lib for librarians / for opac Repeat Mand Koha field Tab Authorised value or
    Thesaurus category
    - " size="40" maxlength="80" />
    " size="40" maxlength="80" />
    or
    or
    '; return false;" />

    Note : in the last column, you can choose :

    • An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table
    • A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table
    • A "value builder" : values builders are perl program that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly
    Confirm Deletion of Subfield
    Subfield
     
    " method="post">" /> " /> " />
    " method="post">" />
    data deleted
    method="post">" />

    MARC subfield structure admin for

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit".

    The column koha field shows that the subfield is linked with a "koha field". Koha can manage a marc interface, or a koha interface. This link ensure that both DB are synchronized, thus you can change from MARC to KOHA interface easily.

    Subfield Lib Koha Field ? Rep ? Mand ? Tab ? Auth value ? Thesaurus ? Val build ? Delete
          YesNo  YesNo          ">Delete
    //images/1leftarrow.png" title="previous" alt="previous" border="0" />
    " />
    " name="searchfield" />
    //images/1rightarrow.png" title="next" alt="next" border="0" />
    --- NEW FILE ---

    " name="Aform" method="post">
    Tag
    Lib for librarians" size="80" maxlength="100" />
    Lib for opac" size="80" maxlength="100" />
    Repeatable
    Mandatory
    Authorised value (if you select a value here, the indicators will be limited to the authorised value list)

    '; return false;" />

    Confirm Deletion of Tag

    Tag
     
    " method="post">" />
    " method="post">

    Data Deleted

    " method="post">

    MARC tag structure admin

    " method="post">
    Tag Lib Repeatable Mandatory Authorised value Subfields Edit/Delete
    "> YesNo YesNo ">subfields ">Edit ">Delete
    <<Previous Tags
    " method="post">
    Next Tags >>
    --- NEW FILE ---

    Modify printer

    Add printer

    " name="Aform" method="post">
    Printer Name
    Printer Name
    Queue " />
    Type " />

    ';" />

    Printer Added

    " method="post">

    Confirm Deletion of Printer

    Printer
    Queue
    Type
    " method="post"> " />
    " method="post">

    Printer Deleted

    " method="post">

    Printer Admin

    You searched for
    " method="post"> " />
    Name Queue Type  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    " method="post">

    ?offset="><< Prev ?offset=">Next >>
    --- NEW FILE ---

    Modify Stop Word

    Add Stop Word

    Stop Word
    Stop Word:

    Update Stop WordAdd Stop Word " onclick="Check(this.form);" class="submit" /> ';" />

    Stop Word Added

    " method="post">

    Confirm Deletion of Stop Word

    Stop Word:
    " method="post"> " />
    " method="post">

    Stop Word Deleted

    " method="post">

    Stop Words Admin

    " method="post"> " />
    You searched for
    Word  
    ?op=delete_confirm&searchfield=">Delete
    " method="get">" />
    " method="post">
    " method="get">" />
    --- NEW FILE ---
    " name="Aform" method="post">

    Modify a system preference

    Add a system preference

    " />
    " />
    " />

    Update ParameterAdd Parameter" onclick="Check(this.form); return false;" class="submit" /> '; return false;" />

    Data Recorded

    " method="post">

    Confirm Deletion of Parameter

    " method="post">" />
    " method="post">

    Parameter Deleted

    " method="post">

    System Preferences Administration

    Variable Value Explanation  
    "> ">Edit ">Delete
    " method="post">

    --- NEW FILE ---

    Thesaurus management

     
    Values related to ()


    " method="post">
    Other forms    
    ">Edit ">Delete
    " method="post"> " /> " />

    " name="Aform" method="post">

    AddModify

    Category
    Authority lib " /> " maxlength="80" size="80" />
    Other lib " maxlength="80" size="80" />

    " /> " /> " /> " /> " /> " /> AddModify Value" />

    lib
    Value
    " method="post"> " /> " />
    CONFIRM DELETION of this entry and all entries depending from this one
    " method="post">

    Thesaurus management

    Manages thesaurus and authorities files.

    • Dig: see data dependent one this one
    • Related: see other forms of this authority entry
    " />
    &search_category=">
      Free form Authority Dig Related Edit Delete
      Dig Related ">//images/fileopen.png" width="32" hspace="0" vspace="0" border="0" /> ">//images/edittrash.png" width="32" hspace="0" vspace="0" border="0" />

    " method="post">

    " method="post"> " /> " /> " />

    --- NEW FILE ---
    " name="Aform" method="post">

    Modify Z39.50 Server

    Add Z39.50 Server

    Z39.50 Server " />
    Z39.50 Server
    Hostname " />
    Port " onblur="isNum(this)" />
    Database " />
    Userid " />
    Password " />
    Checked (searched by default) " onblur="isNum(this)" />
    Rank (display order) " onblur="isNum(this)" />
    Syntax (z3950 can send
    records in various format. Choose one)
    ';" />

    Z39.50 Server Added

    " method="post">

    Confirm Deletion of Server

    Site
    Hostname
    Port
    Database
    Userid
    Password
    Checked
    Rank
    " method="post"> " />
    " method="post">

    Z39.50 Server Deleted

    " method="post">

    Z39.50 Servers Admin

    " method="post"> " />
    You searched for
    Site Hostname Port Database Userid Password Checked Rank Syntax  
    ?op=add_form&searchfield=">Edit ?op=delete_confirm&searchfield=">Delete
    " method="get"> " />
    " method="post">
    " method="get"> " />
    From oleonard at users.sourceforge.net Thu Feb 19 20:22:21 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 11:22:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en about.tmpl,NONE,1.1 auth.tmpl,NONE,1.1 bookcount.tmpl,NONE,1.1 boraccount.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 default.tmpl,NONE,1.1 intranet-main.tmpl,NONE,1.1 mancredit.tmpl,NONE,1.1 maninvoice.tmpl,NONE,1.1 member-flags.tmpl,NONE,1.1 modbib.tmpl,NONE,1.1 modbibitem.tmpl,NONE,1.1 moditem.tmpl,NONE,1.1 modwebsites.tmpl,NONE,1.1 newimember.tmpl,NONE,1.1 newjmember.tmpl,NONE,1.1 newmember.tmpl,NONE,1.1 opac-main.tmpl,NONE,1.1 overdue.tmpl,NONE,1.1 reports.tmpl,NONE,1.1 request.tmpl,NONE,1.1 reservereport.tmpl,NONE,1.1 searchheader.tmpl,NONE,1.1 shelves.tmpl,NONE,1.1 stats.tmpl,NONE,1.1 thesaurus_popup.tmpl,NONE,1.1 updatebiblio.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv614/koha-tmpl/intranet-tmpl/npl/en Added Files: about.tmpl auth.tmpl bookcount.tmpl boraccount.tmpl charges.tmpl default.tmpl intranet-main.tmpl mancredit.tmpl maninvoice.tmpl member-flags.tmpl modbib.tmpl modbibitem.tmpl moditem.tmpl modwebsites.tmpl newimember.tmpl newjmember.tmpl newmember.tmpl opac-main.tmpl overdue.tmpl reports.tmpl request.tmpl reservereport.tmpl searchheader.tmpl shelves.tmpl stats.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: New NPL templates --- NEW FILE ---

    About Koha

    Data about the current version of Koha for bug reports (or general interest).

    Koha version:
    OS version (from 'uname -a'):
    Perl version:
    MySQL version:
    Apache version:
    --- NEW FILE ---

    Sorry, Koha doesn"t think you have permission for this page.

    Sorry, your session has timed out. Please login again.

    You are accessing Koha from a different ip address! Please login again.

    You entered an incorrect username or password. Please try again.

    " method="post"> " value="" />
    Koha Login
    --- NEW FILE ---

    ()

    Barcode

    ">
    ">">">">
    " name="bib">
    Home Branch:
    Current Branch:
    Date arrived at current branch:
    Number of issues since since the above date :
    Branch No. of Issues Last seen at branch
    --- NEW FILE ---
    Account for
    Fines & Charges Amount Still Owed
    Total Due
    " />
    " />
    " />
    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = $1 fine, after 7 days, every 7 days.

    " value="" size="6">
    --- NEW FILE ---

    TitleAuthorItem CountBiblionumber
    ">
    &startfrom=>Previous Records &startfrom=>Next Records

    Results through of records.
    --- NEW FILE ---
    --- NEW FILE ---

    Manual Credit

    " />
    Patron Number
    Credit Type
    Itemnumber
    Description
    Amount
    " name="bornum" />
    --- NEW FILE ---

    Manual Invoice

    " />
    Borrowernumber
    Type
    Itemnumber
    Description
    Amount
    " />
    --- NEW FILE ---
    "> " />
    Set Privileges for ,
    FlagNameDescription
    " />

    '; return false;" />

    --- NEW FILE ---
    ">Modify Website Links
    " /> " />
    Author " />
    Title " />
    Abstract
    Subject
    Copyright Date " />
    Series Title " />
    Additional Author " />
    Subtitle " />
    Unititle " />
    Notes
    Serial " />

    --- NEW FILE ---

    &type=intra"> ()
    Modify Group -

    " /> " />
    RE-ASSIGN TO EXISTING GROUP
    OR MODIFY DETAILS
    Item Type" size="20" />
    URL " size="20" />
    Class" size="20" />
    Publisher" size="20" />
    Place" size="20" />
    ISBN" size="20" />
    Publication Year" size="20" />
    Pages" size="20" />
    Illustrations" size="20" />
    Volume " size="20" />
    Notes " />
    Size " size="20" />
    CHANGES TO AFFECT THESE BARCODES
    Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.
      Barcode Location Date Due Last Seen
    " /> "amp;bib="TMPL_VAR Name="biblionumber">"amp;bi="TMPL_VAR Name="biblioitemnumber">">

    HELP: You must click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record. IF your changes only apply to some items, tick the appropriate ones and a new group record will be created automatically for them.

    --- NEW FILE ---

    ()

    " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " /> " />
    checked="checked"> Yes checked="checked"> No -->
    checked="checked" /> Yes checked="checked" /> No

    --- NEW FILE ---

    Web Sites

    " />
    " /> " />
    Title " />
    Description
    URL " />

    Add another Website Link

    " />
    Title
    Description
    URL
    --- NEW FILE ---
    Invalid cardnumber.

    Valid values

    Click below to confirm this new borrower.

    " value="" />
    --- NEW FILE ---

    Error Completing Form

    -->
    Confirm Details for
    Name
    Membership Number
    Barcode Number
    Date Of Birth
    Sex
    General Notes

    " value="" />

    --- NEW FILE ---

    Confirm Record

    Name: 
    Address: 
    Home Phone:  
    Work Phone:
    Fax:
    E-mail:
    Date Of Birth: 
    Sex: 
    Member Number: 
    Card Number: 
    Category: 
    Registration Date: 
    Expiration Date: 
    Registration Branch: 
    General Notes: 
    Alternate contact: 
    Contact's Phone: 
    Relationship to Patron: 
    Notes:

    " value="" />

    Error

    The following fields have a forbidden value. Please push the back button and try again :

    Cardnumber
    Invalid_cardnumber
    Gender
    Given Names
    Surname
    Postal Street Address
    Postal city
    --- NEW FILE --- WELCOME TO THE KOHA OPAC

    Koha: Horowhenua Library Trust Catalogue and Member Services    		 Search the Catalogue
       

    Type in the box and press the enter key.
    -Advanced Search (More Options)

    Logged in as: [Log Out]

    Log In to Koha

    --- NEW FILE ---

    Items Overdue as of

    Due Date Patron Phone Title Author
    ?subject=Overdue: ">
    --- NEW FILE ---

    reports

    --- NEW FILE ---
    " /> " />

    Add Reserve for ">

    Rank
    Date
    Pickup
    Card Number ?
    Cannot be selected > > -->   -->   -->
    Item Type Call Number Copies
     
    " action="modrequest.pl" method="post">

    Modify Existing Requests

    &type=intra" onClick="openWindow(this, 'Item', 480, 640)"> Next Available This type only : -->
    Rank Patron Notes Date Pickup Location
    " /> " /> ">   Item waiting at " />

    Delete a request by selecting "del" from the rank list.

    --- NEW FILE ---
    NameReserve DateTitleClass

    --- NEW FILE --- ">Results with dewey | ">Results with biblionumber
    --- NEW FILE ---

    Logged in as: [Log Out]

    Shelf List

    Add a book by barcode:

    "> Contents of shelf
    ">"> " width=10 align=center> "> " width=10 align=center> "> " width=10 align=center> ">

    "> ">

    Modify Shelf Contents

    Bookshelves

    "> Select Shelves to Delete
    "> "> ( books)

    Add Shelf:

    ">
    "> Shelf List
    "> "> ( books)

    Add or Remove Book Shelves

    --- NEW FILE ---
    Statistics
    Name Type Date/time Amount Branch

    Total paid:
    Total written off:

    No statistics to report

    --- NEW FILE --- Thesaurus value builder for category <!-- TMPL_VAR name="category" -->

    "> "> ">

    "> "> ">
    "> "> insert a new authority :
    --- NEW FILE ---

    Click submit to force the subject

    " value="" /> " />
    From oleonard at users.sourceforge.net Thu Feb 19 22:12:05 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Thu, 19 Feb 2004 13:12:05 -0800 Subject: [Koha-cvs] CVS: npl-custom - Imported sources Message-ID: Update of /cvsroot/koha/npl-custom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26378 Log Message: Status: Vendor Tag: tcvs-vendor Release Tags: tcvs-release No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources From acli at users.sourceforge.net Thu Feb 19 22:24:33 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 13:24:33 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,NONE,1.1 xgettext.pl,NONE,1.1 TmplToken.pm,1.2,1.3 TmplTokenType.pm,1.2,1.3 TmplTokenizer.pm,1.10,1.11 text-extract2.pl,1.40,1.41 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27741 Modified Files: TmplToken.pm TmplTokenType.pm TmplTokenizer.pm text-extract2.pl Added Files: tmpl_process3.pl xgettext.pl Log Message: New scripts for translation into Chinese and other languages where English word order is too different than the word order of the target language to yield meaningful translations. The new scripts use a different translation file format (namely standard gettext-style PO files). This seems to reasonably work (e.g., producing an empty en_GB translation then installing seems to not corrupt the "translated" files), but it likely will still contain some bugs. There is also little documentation, but try to run perldoc on the .p[lm] files to see what's there. There are also some spurious warnings (both from bugs in the new scripts and from buggy third- party Locale::PO module). --- NEW FILE --- #!/usr/bin/perl # This file is part of Koha # Parts copyright 2003-2004 Paul Poulain # Parts copyright 2003-2004 Jerome Vizcaino # Parts copyright 2004 Ambrose Li =head1 NAME tmpl_process3.pl - Experimental version of tmpl_process.pl using gettext-compatible translation files =cut use strict; use Getopt::Long; use Locale::PO; use File::Temp qw( :POSIX ); use TmplTokenizer; use VerboseWarnings qw( error_normal warn_normal ); ############################################################################### use vars qw( @in_files $in_dir $str_file $out_dir ); use vars qw( @excludes $exclude_regex ); use vars qw( $recursive_p ); use vars qw( $pedantic_p ); use vars qw( $href ); use vars qw( $type ); # file extension (DOS form without the dot) to match ############################################################################### sub find_translation ($) { my($s) = @_; my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; return defined $href->{$key} && length Locale::PO->dequote($href->{$key}->msgstr)? Locale::PO->dequote($href->{$key}->msgstr): $s; } sub text_replace_tag ($$) { my($t, $attr) = @_; my $it; # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; my $translated_p = 0; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME my($pre, $trimmed, $post) = TmplTokenizer::trim $val; if ($val =~ /\S/s) { my $s = $pre . find_translation($trimmed) . $post; if ($attr->{$a}->[1] ne $s) { #FIXME $attr->{$a}->[1] = $s; # FIXME $attr->{$a}->[2] = ($s =~ /"/s)? "'$s'": "\"$s\""; #FIXME $translated_p = 1; } } } } if ($translated_p) { $it = "<$tag" . join('', map { sprintf(' %s=%s', $_, $attr->{$_}->[2]) #FIXME } sort { $attr->{$a}->[3] <=> $attr->{$b}->[3] #FIXME } keys %$attr) . '>'; } else { $it = $t; } return $it; } sub text_replace (**) { my($h, $output) = @_; for (;;) { my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { my($pre, $trimmed, $post) = TmplTokenizer::trim $t; print $output $pre, find_translation($trimmed), $post; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); print $output TmplTokenizer::parametrize($fmt, map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? text_replace_tag($t, $attr): $t } $s->parameters); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); } elsif (defined $t) { print $output $t; } } } # FIXME: Should we use the GNOME convention of using POTFILES.in instead? sub listfiles ($$) { my($dir, $type) = @_; my @it = (); if (opendir(DIR, $dir)) { my @dirent = readdir DIR; # because DIR is shared when recursing closedir DIR; for my $dirent (@dirent) { my $path = "$dir/$dirent"; if ($dirent =~ /^\./ || $dirent eq 'CVS' || $dirent eq 'RCS' || (defined $exclude_regex && $dirent =~ /^(?:$exclude_regex)$/)) { ; } elsif (-f $path) { push @it, $path if !defined $type || $dirent =~ /\.(?:$type)$/; } elsif (-d $path && $recursive_p) { push @it, listfiles($path, $type); } } } else { warn_normal "$dir: $!", undef; } return @it; } ############################################################################### sub usage_error (;$) { for my $msg (split(/\n/, $_[0])) { print STDERR "$msg\n"; } print STDERR "Try `$0 --help' for more information.\n"; exit(-1); } ############################################################################### GetOptions( 'input|i=s' => \@in_files, 'outputdir|o=s' => \$out_dir, 'recursive|r' => \$recursive_p, 'str-file|s=s' => \$str_file, 'exclude|x=s' => \@excludes, 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, ) || usage_error; VerboseWarnings::set_application_name $0; VerboseWarnings::set_pedantic_mode $pedantic_p; my $action = shift or usage_error('You must specify an ACTION.'); usage_error('You must at least specify input and string list filenames.') if !@in_files || !defined $str_file; # Type match defaults to *.tmpl plus *.inc if not specified $type = "tmpl|inc" if !defined($type); # Check the inputs for being files or directories for my $input (@in_files) { usage_error("$input: Input must be a file or directory.\n" . "(Symbolic links are not supported at the moment)") unless -d $input || -f $input;; } # Generates the global exclude regular expression $exclude_regex = '(?:'.join('|', @excludes).')' if @excludes; # Generate the list of input files if a directory is specified if (-d $in_files[0]) { die "If you specify a directory as input, you must specify only it.\n" if @in_files > 1; # input is a directory, generates list of files to process $in_dir = $in_files[0]; $in_dir =~ s/\/$//; # strips the trailing / if any @in_files = listfiles($in_dir, $type); } else { for my $input (@in_files) { die "You cannot specify input files and directories at the same time.\n" unless -f $input; } } if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; system {'./xgettext.pl'} ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { my($tmph1, $tmpfile1) = tmpnam(); my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2); system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { if(!defined($out_dir)) { usage_error("You must specify an output directory when using the install method."); } if ($in_dir eq $out_dir) { warn "You must specify a different input and output directory.\n"; exit -1; } # Make sure the output directory exists # (It will auto-create it, but for compatibility we should not) -d $out_dir || die "$out_dir: The directory does not exist\n"; # Try to open the file, because Locale::PO doesn't check :-/ open(INPUT, "<$str_file") || die "$str_file: $!\n"; close INPUT; # restores the string list from file $href = Locale::PO->load_file_ashash($str_file); # creates the new tmpl file using the new translation for my $input (@in_files) { die "Assertion failed" unless substr($input, 0, length($in_dir) + 1) eq "$in_dir/"; my $h = TmplTokenizer->new( $input ); $h->set_allow_cformat( 1 ); VerboseWarnings::set_input_file_name $input; my $target = $out_dir . substr($input, length($in_dir)); my $targetdir = $` if $target =~ /[^\/]+$/s; if (!-d $targetdir) { print STDERR "Making directory $targetdir..."; # creates with rwxrwxr-x permissions mkdir($targetdir, 0775) || warn_normal "$targetdir: $!", undef; } print STDERR "Creating $target...\n"; open( OUTPUT, ">$target" ) || die "$target: $!\n"; text_replace( $h, *OUTPUT ); close OUTPUT; } } else { usage_error('Unknown action specified.'); } exit 0; ############################################################################### =head1 SYNOPSIS ./tmpl_process3.pl [ I ] =head1 DESCRIPTION This is an experimental version of the tmpl_process.pl script, using standard gettext-style PO files. Currently, the create, update, and install actions have all been reimplemented and seem to work. The create action calls xgettext.pl to do the actual work; the update action calls xgettext.pl and msgmerge(1) to do the actual work. The script can detect directives embedded inside what appears to be a full sentence (this actual work being done by TmplTokenizer(3)); these larger patterns appear in the translation file as c-format strings with %s. =head1 BUGS The --help option has not been implemented yet. There are probably some real bugs too, since this has not been tested very much. xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. The script currently does not check carefully whether these dependent commands are present. Locale::PO(3) has a lot of bugs. It can neither parse nor generate GNU PO files properly; a couple of workarounds have been written in TmplTokenizer and more is likely to be needed (e.g., to get rid of the "Strange line" warning for #~). =head1 SEE ALSO xgettext.pl, msgmerge(1), Locale::PO(3), translator_doc.txt =cut --- NEW FILE --- #!/usr/bin/perl =head1 NAME xgettext.pl - xgettext(1)-like interface for .tmpl strings extraction =cut use strict; use Getopt::Long; use Locale::PO; use TmplTokenizer; use VerboseWarnings; use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); use vars qw( %text ); ############################################################################### sub remember ($$) { my($token, $string) = @_; $text{$string} = [] unless defined $text{$string}; push @{$text{$string}}, $token; } ############################################################################### sub string_list () { my @t = keys %text; # The real gettext tools seems to sort case sensitively; I don't know why @t = sort { $a cmp $b } @t if $sort eq 's'; @t = sort { my @aa = sort { $a->pathname cmp $b->pathname || $a->line_number <=> $b->line_number } @{$text{$a}}; my @bb = sort { $a->pathname cmp $b->pathname || $a->line_number <=> $b->line_number } @{$text{$b}}; $aa[0]->pathname cmp $bb[0]->pathname || $aa[0]->line_number <=> $bb[0]->line_number; } @t if $sort eq 'F'; return @t; } ############################################################################### sub text_extract (*) { my($h) = @_; for (;;) { my $s = TmplTokenizer::next_token $h; last unless defined $s; my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { #$t = TmplTokenizer::trim $t; remember( $s, $t ) if $t =~ /\S/s; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { #$t = TmplTokenizer::trim $t; remember( $s, $s->form ) if $s->form =~ /\S/s; } elsif ($kind eq TmplTokenType::TAG && %$attr) { # value [tag=input], meta my $tag = lc($1) if $t =~ /^<(\S+)/s; for my $a ('alt', 'content', 'title', 'value') { if ($attr->{$a}) { next if $a eq 'content' && $tag ne 'meta'; next if $a eq 'value' && ($tag ne 'input' || (ref $attr->{'type'} && $attr->{'type'}->[1] =~ /^(?:hidden|radio)$/)); # FIXME my($key, $val, $val_orig, $order) = @{$attr->{$a}}; #FIXME $val = TmplTokenizer::trim $val; remember( $s, $val ) if $val =~ /\S/s; } } } } } ############################################################################### sub generate_strings_list () { # Emit all extracted strings. # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (string_list) { printf OUTPUT "%s\n", $t unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } ############################################################################### sub generate_po_file () { # We don't emit the Plural-Forms header; it's meaningless for us print OUTPUT <, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\\n" "POT-Creation-Date: 2004-02-05 20:55-0500\\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n" "Last-Translator: FULL NAME \\n" "Language-Team: LANGUAGE \\n" "MIME-Version: 1.0\\n" "Content-Type: text/plain; charset=CHARSET\\n" "Content-Transfer-Encoding: 8bit\\n" EOF my $directory_re = quotemeta("$directory/"); for my $t (string_list) { next if TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; my $cformat_p; for my $token (@{$text{$t}}) { my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( $t ); printf OUTPUT "msgstr \"\"\n\n"; } } ############################################################################### sub usage ($) { my($exitcode) = @_; my $h = $exitcode? *STDERR: *STDOUT; print $h < \$directory, 'f|files-from=s' => \$files_from, 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, 'output|o=s' => \$output, 's|sort-output' => sub { $sort = 's' }, 'F|sort-by-file' => sub { $sort = 'F' }, 'help' => sub { usage(0) }, ) || usage_error; VerboseWarnings::set_application_name $0; VerboseWarnings::set_pedantic_mode $pedantic_p; usage_error('Missing mandatory option -f') unless defined $files_from; $directory = '.' unless defined $directory; if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; } else { open(OUTPUT, ">&STDOUT"); } open(INPUT, "<$files_from") || die "$files_from: $!\n"; while () { chomp; my $h = TmplTokenizer->new( "$directory/$_" ); $h->set_allow_cformat( 1 ); VerboseWarnings::set_input_file_name "$directory/$_"; text_extract( $h ); } close INPUT; generate_po_file; warn "This input will not work with Mozilla standards-compliant mode\n", undef if TmplTokenizer::syntaxerror_p; exit(-1) if TmplTokenizer::fatal_p; ############################################################################### =head1 DESCRIPTION This is an experimental script based on the modularized text-extract2.pl script. It has behaviour similar to xgettext(1), and generates gettext-compatible output files. A gettext-like format provides the following advantages: =over =item - (Future goal) Translation to non-English-like languages with different word order: gettext's c-format strings can theoretically be emulated if we are able to do some analysis on the .tmpl input and treat in a way similar to %s. =item - Context for the extracted strings: the gettext format provides the filenames and line numbers where each string can be found. The translator can read the source file and see the context, in case the string by itself can mean several different things. =item - Place for the translator to add comments about the translations. =item - Gettext-compatible tools, if any, might be usable if we adopt the gettext format. =back Right now it does about the same thing as text-extract2.pl but generates gettext-style output; however, because it is scanner- instead of parser-based, it is able to address the 4 weaknesses listed in translator_doc.txt. Ultimately, the goal is to make this able to do some kind of simple analysis on the input to produce gettext-style output with c-format strings, in order to facilitate translation to languages with a different word order than English. When the above is finished, the generated po file may contain some HTML tags in addition to %s strings. If you want to generate GNOME-style POTFILES.in files, such files (passed to -f) can be generated thus: (cd ../.. && find koha-tmpl/opac-tmpl/default/en -name \*.inc -o -name \*.tmpl) > opac/POTFILES.in (cd ../.. && find koha-tmpl/intranet-tmpl/default/en -name \*.inc -o -name \*.tmpl) > intranet/POTFILES.in This is, however, quite pointless, because the "create" and "update" actions have already been implemented in tmpl_process3.pl. =head1 SEE ALSO tmpl_process.pl, xgettext(1), Locale::PO(3), translator_doc.txt =head1 BUGS There probably are some. Bugs related to scanning of tags seem to be especially likely to be present. Its diagnostics are probably too verbose. When a within a JavaScript-related attribute is detected, the script currently displays no warnings at all. It might be good to display some kind of warning. Its sort order (-s option) seems to be different than the real xgettext(1)'s sort option. This will result in translation strings inside the generated PO file spuriously moving about when tmpl_process3.pl calls msgmerge(1) to update the PO file. =cut Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplToken.pm 17 Feb 2004 05:42:27 -0000 1.2 --- TmplToken.pm 19 Feb 2004 21:24:30 -0000 1.3 *************** *** 68,71 **** --- 68,104 ---- } + # only meaningful for TEXT_PARAMETRIZED tokens + sub children { + my $this = shift; + return $this->{'_kids'}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub set_children { + my $this = shift; + $this->{'_kids'} = ref $_[0] eq 'ARRAY'? $_[0]: \@_; + return $this; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + # FIXME: DIRECTIVE is not necessarily TMPL_VAR !! + sub parameters { + my $this = shift; + return map { $_->type == TmplTokenType::DIRECTIVE? $_: ()} @{$this->{'_kids'}}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub form { + my $this = shift; + return $this->{'_form'}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens + sub set_form { + my $this = shift; + $this->{'_form'} = $_[0]; + return $this; + } + ############################################################################### Index: TmplTokenType.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenType.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TmplTokenType.pm 17 Feb 2004 03:02:39 -0000 1.2 --- TmplTokenType.pm 19 Feb 2004 21:24:30 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- This is a Java-style "safe enum" singleton class for types of TmplToken objects. + The predefined constants are =cut *************** *** 25,28 **** --- 26,30 ---- @EXPORT_OK = qw( &TEXT + &TEXT_PARAMETRIZED &CDATA &TAG *************** *** 36,40 **** ############################################################################### ! use vars qw( $_text $_cdata $_tag $_decl $_pi $_directive $_comment $_unknown ); BEGIN { --- 38,43 ---- ############################################################################### ! use vars qw( $_text $_text_parametrized $_cdata ! $_tag $_decl $_pi $_directive $_comment $_null $_unknown ); BEGIN { *************** *** 47,58 **** return $self; }; ! $_text = &$new(0, 'TEXT'); ! $_cdata = &$new(1, 'CDATA'); ! $_tag = &$new(2, 'TAG'); ! $_decl = &$new(3, 'DECL'); ! $_pi = &$new(4, 'PI'); ! $_directive = &$new(5, 'DIRECTIVE'); ! $_comment = &$new(6, 'COMMENT'); ! $_unknown = &$new(7, 'UNKNOWN'); } --- 50,62 ---- return $self; }; ! $_text = &$new(0, 'TEXT'); ! $_text_parametrized = &$new(8, 'TEXT-PARAMETRIZED'); ! $_cdata = &$new(1, 'CDATA'); ! $_tag = &$new(2, 'TAG'); ! $_decl = &$new(3, 'DECL'); ! $_pi = &$new(4, 'PI'); ! $_directive = &$new(5, 'DIRECTIVE'); ! $_comment = &$new(6, 'COMMENT'); ! $_unknown = &$new(7, 'UNKNOWN'); } *************** *** 62,75 **** } ! sub TEXT () { $_text } ! sub CDATA () { $_cdata } ! sub TAG () { $_tag } ! sub DECL () { $_decl } ! sub PI () { $_pi } ! sub DIRECTIVE () { $_directive } ! sub COMMENT () { $_comment } ! sub UNKNOWN () { $_unknown } ############################################################################### 1; --- 66,128 ---- } ! sub TEXT () { $_text } ! sub TEXT_PARAMETRIZED () { $_text_parametrized } ! sub CDATA () { $_cdata } ! sub TAG () { $_tag } ! sub DECL () { $_decl } ! sub PI () { $_pi } ! sub DIRECTIVE () { $_directive } ! sub COMMENT () { $_comment } ! sub UNKNOWN () { $_unknown } ############################################################################### + =over + + =item TEXT + + normal text (#text in the DTD) + + =item TEXT_PARAMETRIZED + + parametrized normal text + (result of simple recognition of text interspersed with directives; + this has to be explicitly enabled in the scanner) + + =item CDATA + + normal text (CDATA in the DTD) + + =item TAG + + something that has the form of an HTML tag + + =item DECL + + something that has the form of an SGML declaration + + =item PI + + something that has the form of an SGML processing instruction + + =item DIRECTIVE + + a HTML::Template directive (whether or not embedded in an SGML comment) + + =item COMMENT + + something that has the form of an HTML comment + (and is not recognized as an HTML::Template directive) + + =item UNKNOWN + + something that is not recognized at all by the scanner + + =back + + Note that end of file is currently represented by undef, + instead of a constant predefined by this module. + + =cut + 1; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** TmplTokenizer.pm 18 Feb 2004 06:56:19 -0000 1.10 --- TmplTokenizer.pm 19 Feb 2004 21:24:30 -0000 1.11 *************** *** 23,31 **** This module is a simple-minded attempt at such a scanner. - =head1 HISTORY - - This tokenizer is mostly based - on Ambrose's hideous Perl script known as subst.pl. - =cut --- 23,26 ---- *************** *** 98,101 **** --- 93,98 ---- sub CDATA_CLOSE () {'cdata-close'} + sub ALLOW_CFORMAT_P () {'allow-cformat-p'} + sub new { my $this = shift; *************** *** 171,174 **** --- 168,176 ---- } + sub allow_cformat_p { + my $this = shift; + return $this->{+ALLOW_CFORMAT_P}; + } + # Simple setters *************** *** 232,235 **** --- 234,243 ---- } + sub set_allow_cformat { + my $this = shift; + $this->{+ALLOW_CFORMAT_P} = $_[0]; + return $this; + } + ############################################################################### *************** *** 306,310 **** $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])+/s) { # non-space normal text ($kind, $it) = (TmplTokenType::TEXT, $&); $this->_set_readahead( $' ); --- 314,318 ---- $this->_set_readahead( $' ); # FIXME the following (the [<\s] part) is an unreliable HACK :-( ! } elsif ($this->_peek_readahead =~ /^(?:[^<]|<[<\s])*(?:[^<\s])/s) { # non-space normal text ($kind, $it) = (TmplTokenType::TEXT, $&); $this->_set_readahead( $' ); *************** *** 324,331 **** } } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! ($kind, $it) = (TmplTokenType::TAG, "$1>"); ! $this->_set_readahead( $3 ); ! $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $1<\n", $this->line_number_start if $2 eq ''; } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); --- 332,346 ---- } } elsif ($this->_peek_readahead =~ /^$re_tag_compat/os) { ! # If we detect a "closed start tag" but we know that the ! # following token looks like a TMPL_VAR, don't stop ! my($head, $tail, $post) = ($1, $2, $3); ! if ($tail eq '' && $post =~ $re_tmpl_var) { ! warn_normal "Possible SGML \"closed start tag\" notation: $head<\n", $this->line_number; ! } else { ! ($kind, $it) = (TmplTokenType::TAG, "$head>"); ! $this->_set_readahead( $post ); ! $ok_p = 1; ! warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; ! } } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); *************** *** 348,352 **** $kind = TmplTokenType::COMMENT if $it =~ /^).)*-->/; if ($kind == TmplTokenType::COMMENT && $it =~ /^).)*-->/; if ($kind == TmplTokenType::COMMENT && $it =~ /^ ! "> ! "&bib=""&bi="""> --- 81,87 ---- ! "> ! &bib=&bi="> From acli at users.sourceforge.net Fri Feb 20 03:49:28 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple additem-nomarc.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/acqui.simple Modified Files: additem-nomarc.tmpl Log Message: Make the translation tool happier. Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** additem-nomarc.tmpl 9 Dec 2003 10:29:07 -0000 1.6 --- additem-nomarc.tmpl 20 Feb 2004 02:49:26 -0000 1.7 *************** *** 174,178 **** LCCN: ! --- 174,178 ---- LCCN: ! From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbasket2.tmpl,1.8,1.9 supplier.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/acqui Modified Files: newbasket2.tmpl supplier.tmpl Log Message: Make the translation tool happier. Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** newbasket2.tmpl 11 Feb 2004 09:03:47 -0000 1.8 --- newbasket2.tmpl 20 Feb 2004 02:49:26 -0000 1.9 *************** *** 4,16 **** ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! "> ! //images/1uparrow.png" border=0 align=right alt="View Basket">
    > --- 4,16 ---- ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Add New Biblio"> ! "> ! //images/1uparrow.png" border=0 align=right alt="View Basket"> > Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** supplier.tmpl 11 Feb 2004 09:03:47 -0000 1.9 --- supplier.tmpl 20 Feb 2004 02:49:26 -0000 1.10 *************** *** 25,29 **** Postal Address ! --- 25,29 ---- Postal Address ! *************** *** 99,103 **** Active ! Inactive --- 99,103 ---- Active ! Inactive From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.16,1.17 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/circ Modified Files: circulation.tmpl Log Message: Make the translation tool happier. Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** circulation.tmpl 11 Feb 2004 09:03:46 -0000 1.16 --- circulation.tmpl 20 Feb 2004 02:49:26 -0000 1.17 *************** *** 242,246 **** CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment ! --- 242,246 ---- CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment ! > From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport AcceptMarcUpload.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/marcimport Modified Files: AcceptMarcUpload.tmpl Log Message: Make the translation tool happier. Index: AcceptMarcUpload.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AcceptMarcUpload.tmpl 9 Dec 2003 10:29:03 -0000 1.2 --- AcceptMarcUpload.tmpl 20 Feb 2004 02:49:27 -0000 1.3 *************** *** 23,27 **** ! Name this set of MARC records: --- 23,27 ---- ! "> Name this set of MARC records: From acli at users.sourceforge.net Fri Feb 20 03:49:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes opac-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/includes Modified Files: opac-top.inc Log Message: Make the translation tool happier. Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** opac-top.inc 9 Dec 2003 10:29:04 -0000 1.7 --- opac-top.inc 20 Feb 2004 02:49:27 -0000 1.8 *************** *** 23,27 **** --> ! --- 23,27 ---- --> !
    *************** *** 75,78 **** !
    --- 75,78 ---- !
    From acli at users.sourceforge.net Fri Feb 20 03:49:30 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:30 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members jmemberentry.tmpl,1.8,1.9 memberentry.tmpl,1.22,1.23 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/members Modified Files: jmemberentry.tmpl memberentry.tmpl Log Message: Make the translation tool happier. Index: jmemberentry.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** jmemberentry.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- jmemberentry.tmpl 20 Feb 2004 02:49:27 -0000 1.9 *************** *** 31,35 ****
    --- 61,65 ---- Index: detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** detail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 --- detail.tmpl 20 Feb 2004 02:49:26 -0000 1.11 *************** *** 15,19 ****

    &bib=&bi=">http://
    &bib=&bi=">http://
    ! ! ! !
    --- 15,19 ----

    ! ! ! ! ! ! ! !
    Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** moredetail.tmpl 11 Feb 2004 09:03:46 -0000 1.10 --- moredetail.tmpl 20 Feb 2004 02:49:26 -0000 1.11 *************** *** 18,22 **** > > ! --- 18,22 ---- > > !
    *************** *** 27,31 **** bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    //images/fileopen.png"> ! //images/edittrash.png">
    --- 27,31 ----     		//images/fileopen.png"> ! //images/edittrash.png">
    Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** searchresults.tmpl 11 Feb 2004 09:03:46 -0000 1.8 --- searchresults.tmpl 20 Feb 2004 02:49:26 -0000 1.9 *************** *** 62,70 ****
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    ! &=&type=opacintra>Previous Records   --- 62,70 ----
    ! ! bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif">
    ! &=&type=opacintra">Previous Records   *************** *** 73,77 **** ! &=&type=opacintra>Next Records   --- 73,77 ---- ! &=&type=opacintra">Next Records   From acli at users.sourceforge.net Fri Feb 20 03:49:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 18:49:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters authorised_values.tmpl,1.18,1.19 categoryitem.tmpl,1.8,1.9 checkmarc.tmpl,1.7,1.8 koha2marclinks.tmpl,1.10,1.11 marc_subfields_structure.tmpl,1.24,1.25 marctagstructure.tmpl,1.20,1.21 thesaurus.tmpl,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1060/parameters Modified Files: authorised_values.tmpl categoryitem.tmpl checkmarc.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl thesaurus.tmpl Log Message: Make the translation tool happier. Index: authorised_values.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** authorised_values.tmpl 11 Feb 2004 09:02:55 -0000 1.18 --- authorised_values.tmpl 20 Feb 2004 02:49:27 -0000 1.19 *************** *** 2,6 **** !

    --- 2,6 ---- !

    *************** *** 30,34 **** ! --- 30,34 ---- !
    *************** *** 47,51 **** !

    Authorised values admin

    --- 47,51 ---- !

    Authorised values admin

    Index: categoryitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** categoryitem.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- categoryitem.tmpl 20 Feb 2004 02:49:27 -0000 1.9 *************** *** 288,292 **** ! ! ! Index: checkmarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** checkmarc.tmpl 11 Feb 2004 09:02:55 -0000 1.7 --- checkmarc.tmpl 20 Feb 2004 02:49:27 -0000 1.8 *************** *** 6,10 **** ! --- 6,10 ---- ! *************** *** 19,23 **** ! --- 19,23 ---- ! *************** *** 33,37 **** ! --- 33,37 ---- ! *************** *** 45,49 **** ! --- 45,49 ---- ! *************** *** 59,63 **** ! --- 59,63 ---- ! *************** *** 71,75 **** ! --- 71,75 ---- ! *************** *** 85,89 **** ! --- 85,89 ---- ! *************** *** 99,103 **** ! --- 99,103 ---- ! *************** *** 114,118 **** ! --- 114,118 ---- ! Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** koha2marclinks.tmpl 11 Feb 2004 09:02:55 -0000 1.10 --- koha2marclinks.tmpl 20 Feb 2004 02:49:28 -0000 1.11 *************** *** 2,11 **** !

    Choose and validate 1 of the following for .

    EditDelete --- 288,293 ---- EditDelete
    Result
    Result
    ! ! ! --- 21,29 ---- ! ! From acli at users.sourceforge.net Sun Feb 22 07:46:26 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 22:46:26 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.17,1.18 intranet.zh_TW,1.4,1.5 xgettext.pl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13681 Modified Files: TmplTokenizer.pm intranet.zh_TW xgettext.pl Log Message: Templates with French characters were not handled properly in the install step. This is now fixed. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** TmplTokenizer.pm 22 Feb 2004 05:18:52 -0000 1.17 --- TmplTokenizer.pm 22 Feb 2004 06:46:15 -0000 1.18 *************** *** 536,540 **** $s =~ s/([\\"])/\\\1/gs; $s =~ s/\n/\\n/g; ! $s =~ s/[\177-\377]/ sprintf("\\%03o", ord($&)) /egs; return "\"$s\""; } --- 536,540 ---- $s =~ s/([\\"])/\\\1/gs; $s =~ s/\n/\\n/g; ! #$s =~ s/[\177-\377]/ sprintf("\\%03o", ord($&)) /egs; return "\"$s\""; } *************** *** 581,584 **** --- 581,621 ---- } + use vars qw( @latin1_utf8 ); + @latin1_utf8 = ( + "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", + "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", + "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", + "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", + "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", + "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", + "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", + "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", + "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", + "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", + "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", + "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", + "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", + "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", + "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", + "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", + "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", + "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", + "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", + "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", + "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", + "\303\276", "\303\277" ); + + sub charset_convert ($$$) { + my($s, $charset_in, $charset_out) = @_; + if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now + ; + } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { + $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; + } elsif ($charset_in ne $charset_out) { + VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; + } + return $s; + } + ############################################################################### Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** intranet.zh_TW 20 Feb 2004 09:32:14 -0000 1.4 --- intranet.zh_TW 22 Feb 2004 06:46:16 -0000 1.5 *************** *** 4,7 **** --- 4,10 ---- # Copyright 2004 Ambrose Li # + # FIXME words tentatively translated: active, illustration, illustrator, inactive + # FIXME "request", "reserve" should be ?????? [http://www.tpml.edu.tw/chinese/service/service.htm] + # msgid "" msgstr "" *************** *** 39,52 **** [...3717 lines suppressed...] - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:43 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:44 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:45 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:46 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:47 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:48 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:49 - #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 - msgid "||" - msgstr "||" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 --- 7096,7099 ---- *************** *** 7221,7222 **** --- 7108,7110 ---- "Help" msgstr "" + Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** xgettext.pl 22 Feb 2004 05:18:52 -0000 1.2 --- xgettext.pl 22 Feb 2004 06:46:17 -0000 1.3 *************** *** 15,18 **** --- 15,19 ---- use vars qw( $convert_from ); use vars qw( $files_from $directory $output $sort ); + use vars qw( $extract_all_p ); use vars qw( $pedantic_p ); use vars qw( %text %translation ); *************** *** 21,59 **** ############################################################################### ! use vars qw( @latin1_utf8 ); ! @latin1_utf8 = ( ! "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", ! "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", ! "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", ! "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", ! "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", ! "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", ! "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", ! "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", ! "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", ! "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", ! "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", ! "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", ! "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", ! "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", ! "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", ! "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", ! "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", ! "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", ! "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", ! "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", ! "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", ! "\303\276", "\303\277" ); ! ! sub charset_convert ($) { ! my($s) = @_; ! if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now ! ; ! } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { ! $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; ! } elsif ($charset_in ne $charset_out) { ! VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; ! } ! return $s; } --- 22,37 ---- ############################################################################### ! sub negligible_p ($) { ! my($t) = @_; # a string ! # Don't emit pure whitespace, pure numbers, pure punctuation, ! # single letters, or TMPL_VAR's. ! # Punctuation should arguably be translated. But without context ! # they are untranslatable. ! return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR ! || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\.,:;'"%\(\)\[\]\|]+$/ # pure punctuation w/o context ! || $t =~ /^[A-Za-z]$/ # single letters ! ); } *************** *** 118,125 **** sub generate_strings_list () { # Emit all extracted strings. - # Don't emit pure whitespace, pure numbers, or TMPL_VAR's. for my $t (string_list) { ! printf OUTPUT "%s\n", $t ! unless TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; } } --- 96,101 ---- sub generate_strings_list () { # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t unless negligible_p($t); } } *************** *** 152,156 **** my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if TmplTokenizer::blank_p($t) || $t =~ /^\d+$/; my $cformat_p; for my $token (@{$text{$t}}) { --- 128,132 ---- my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { *************** *** 162,166 **** } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( charset_convert $t ); printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? TmplTokenizer::quote_po( $translation{$t} ): "\"\""); --- 138,143 ---- } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po ! TmplTokenizer::charset_convert $t, $charset_in, $charset_out; printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? TmplTokenizer::quote_po( $translation{$t} ): "\"\""); *************** *** 201,204 **** --- 178,182 ---- } } + # The following assumption is correct; that's what HTML::Template assumes if (!defined $charset_in) { $charset_in = $charset_out = TmplTokenizer::charset_canon 'iso8859-1'; *************** *** 224,227 **** --- 202,206 ---- HTML::Template options: + -a, --extract-all Extract all strings --pedantic-warnings Issue warnings even for detected problems which are likely to be harmless *************** *** 249,252 **** --- 228,232 ---- Getopt::Long::config qw( bundling no_auto_abbrev ); GetOptions( + 'a|extract-all' => \$extract_all_p, 'charset=s' => sub { $charset_in = $charset_out = $_[1] }, # INTERNAL 'convert-from=s' => \$convert_from, From acli at users.sourceforge.net Sun Feb 22 08:00:19 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 23:00:19 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.18,1.19 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15661 Modified Files: TmplTokenizer.pm Log Message: Ugly hack to get rid of the close tag in pathetic "foo %s"-like strings Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** TmplTokenizer.pm 22 Feb 2004 06:46:15 -0000 1.18 --- TmplTokenizer.pm 22 Feb 2004 07:00:16 -0000 1.19 *************** *** 486,489 **** --- 486,503 ---- push @{$this->{_queue}}, pop @structure; } + # FIXME: If the last token is a close tag but there are no tags + # FIXME: before it, drop the close tag back into the queue. This + # FIXME: is an ugly hack to get rid of "foo %s" type mess. + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TAG + && $structure[$#structure]->string =~ /^<\//) { + my $has_other_tags_p = 0; + for (my $i = 0; $i < $#structure; $i += 1) { + $has_other_tags_p = 1 + if $structure[$i]->type == TmplTokenType::TAG; + last if $has_other_tags_p; + } + push @{$this->{_queue}}, pop @structure unless $has_other_tags_p + } if (@structure < 2) { # Nothing to do From acli at users.sourceforge.net Sun Feb 22 09:18:30 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:18:30 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.19,1.20 tmpl_process3.pl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27216 Modified Files: TmplTokenizer.pm tmpl_process3.pl Log Message: The French character handling fix for tmpl_process3 was not checked in for some reason. Try to remove trailing ( in strings too. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** TmplTokenizer.pm 22 Feb 2004 07:00:16 -0000 1.19 --- TmplTokenizer.pm 22 Feb 2004 08:18:27 -0000 1.20 *************** *** 443,446 **** --- 443,482 ---- } + sub _optimize { + my $this = shift; + my @structure = @_; + my $undo_trailing_blanks = sub { + for (my $i = $#structure; $i >= 0; $i -= 1) { + last if $structure[$i]->type != TmplTokenType::TEXT; + last if !blank_p($structure[$i]->string); + push @{$this->{_queue}}, pop @structure; + } + }; + # FIXME: If the last token is a close tag but there are no tags + # FIXME: before it, drop the close tag back into the queue. This + # FIXME: is an ugly hack to get rid of "foo %s" type mess. + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TAG + && $structure[$#structure]->string =~ /^<\//s) { + my $has_other_tags_p = 0; + printf STDERR "last token %d is type %s: %s\n", $#structure, $structure[$#structure]->type->to_string, $structure[$#structure]->string; + for (my $i = 0; $i < $#structure; $i += 1) { + printf STDERR "token %d is type %s: %s\n", $i, $structure[$i]->type->to_string, $structure[$i]->string; + $has_other_tags_p = 1 if $structure[$i]->type == TmplTokenType::TAG; + last if $has_other_tags_p; + } + push @{$this->{_queue}}, pop @structure unless $has_other_tags_p; + &$undo_trailing_blanks; + } + # FIXME: Do the same ugly hack for the last token being a ( or [ + if (@structure >= 2 + && $structure[$#structure]->type == TmplTokenType::TEXT + && $structure[$#structure]->string =~ /^[\(\[]$/) { # not )] + push @{$this->{_queue}}, pop @structure; + &$undo_trailing_blanks; + } + return @structure; + } + sub next_token { my $this = shift; *************** *** 486,503 **** push @{$this->{_queue}}, pop @structure; } ! # FIXME: If the last token is a close tag but there are no tags ! # FIXME: before it, drop the close tag back into the queue. This ! # FIXME: is an ugly hack to get rid of "foo %s" type mess. ! if (@structure >= 2 ! && $structure[$#structure]->type == TmplTokenType::TAG ! && $structure[$#structure]->string =~ /^<\//) { ! my $has_other_tags_p = 0; ! for (my $i = 0; $i < $#structure; $i += 1) { ! $has_other_tags_p = 1 ! if $structure[$i]->type == TmplTokenType::TAG; ! last if $has_other_tags_p; ! } ! push @{$this->{_queue}}, pop @structure unless $has_other_tags_p ! } if (@structure < 2) { # Nothing to do --- 522,526 ---- push @{$this->{_queue}}, pop @structure; } ! @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** tmpl_process3.pl 22 Feb 2004 05:18:52 -0000 1.3 --- tmpl_process3.pl 22 Feb 2004 08:18:27 -0000 1.4 *************** *** 34,37 **** --- 34,38 ---- my($s) = @_; my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; + $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); return defined $href->{$key} && !$href->{$key}->fuzzy *************** *** 147,150 **** --- 148,154 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; + # try to make sure .po files are backed up (see BUGS) + $ENV{VERSION_CONTROL} = 't'; + # keep the buggy Locale::PO quiet if it says stupid things $SIG{__WARN__} = sub { *************** *** 320,323 **** --- 324,330 ---- dependent commands are present. + If xgettext.pl is interrupted by the user, a corrupted po file + will result. This is very seriously wrong. + Locale::PO(3) has a lot of bugs. It can neither parse nor generate GNU PO files properly; a couple of workarounds have From acli at users.sourceforge.net Sun Feb 22 09:49:34 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:34 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305/members Modified Files: moremember.tmpl Log Message: Grammatical correction Index: moremember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** moremember.tmpl 11 Feb 2004 09:02:55 -0000 1.25 --- moremember.tmpl 22 Feb 2004 08:49:32 -0000 1.26 *************** *** 137,145 **** ! ! ! ! ! --- 137,145 ---- ! ! ! ! ! From acli at users.sourceforge.net Sun Feb 22 09:49:35 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters thesaurus.tmpl,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305/parameters Modified Files: thesaurus.tmpl Log Message: Grammatical correction Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** thesaurus.tmpl 20 Feb 2004 02:49:28 -0000 1.19 --- thesaurus.tmpl 22 Feb 2004 08:49:32 -0000 1.20 *************** *** 88,92 **** "> ! --- 88,92 ---- "> ! *************** *** 99,103 ****

    Manages thesaurus and authorities files.

      ! Dig: see data depending of this one
      Related: see other forms of this authority entry

    --- 99,103 ----

    Manages thesaurus and authorities files.

      ! Dig: see data depending on this one
      Related: see other forms of this authority entry

    From acli at users.sourceforge.net Sun Feb 22 09:49:34 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 00:49:34 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv305 Modified Files: request.tmpl Log Message: Grammatical correction Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** request.tmpl 11 Feb 2004 09:01:41 -0000 1.11 --- request.tmpl 22 Feb 2004 08:49:31 -0000 1.12 *************** *** 44,53 ****
    --- 2,11 ---- !

    Choose and validate 1 of the following for .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    *************** *** 20,24 ****
    --- 20,24 ----
    *************** *** 33,37 ****
    --- 33,37 ----
    *************** *** 46,50 ****
    --- 46,50 ----
    *************** *** 59,63 ****
    --- 59,63 ----
    *************** *** 72,76 ****
    --- 72,76 ----
    *************** *** 85,89 ****
    --- 85,89 ----
    *************** *** 98,102 ****
    --- 98,102 ----
    *************** *** 111,115 ****
    --- 111,115 ----
    *************** *** 124,128 ****
    --- 124,128 ----
    *************** *** 153,157 **** ! MARC links --- 153,157 ---- ! MARC links Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** marc_subfields_structure.tmpl 11 Feb 2004 09:02:55 -0000 1.24 --- marc_subfields_structure.tmpl 20 Feb 2004 02:49:28 -0000 1.25 *************** *** 5,9 **** !

    --- 5,9 ---- !

    *************** *** 44,48 **** ! --- 44,48 ---- !
    *************** *** 59,70 **** ! Data deleted ! ' method=post>"> !

    MARC subfield structure admin for

    *************** *** 77,87 **** ! ! ! ! ! ! ! --- 77,87 ---- ! ! ! ! ! ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** marctagstructure.tmpl 9 Dec 2003 10:29:01 -0000 1.20 --- marctagstructure.tmpl 20 Feb 2004 02:49:28 -0000 1.21 *************** *** 53,57 **** !

    --- 53,57 ---- !

    *************** *** 71,75 **** !
    Lib Koha field ?Rep ?Mand ?Tab ?Auth value ?Thesaurus ?Val build ?Delete
    Lib Koha field ?Rep ?Mand ?Tab ?Auth value ?Thesaurus ?Val build ?Delete
    --- 71,75 ---- !
    *************** *** 84,88 **** ! Data deleted --- 84,88 ---- ! Data deleted *************** *** 91,95 **** !

    MARC tag structure admin

    --- 91,95 ---- !

    MARC tag structure admin

    Index: thesaurus.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** thesaurus.tmpl 11 Feb 2004 09:02:55 -0000 1.18 --- thesaurus.tmpl 20 Feb 2004 02:49:28 -0000 1.19 *************** *** 2,6 **** ! Thesaurus management
    --- 2,6 ---- ! Thesaurus management
    *************** *** 34,38 **** !

    ModifyAdd

    --- 34,38 ---- !

    ModifyAdd

    *************** *** 75,79 **** !
    --- 75,79 ---- !
    *************** *** 94,98 **** !

    Thesaurus management

    --- 94,98 ---- !

    Thesaurus management

    From acli at users.sourceforge.net Fri Feb 20 04:01:23 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en default.tmpl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941 Modified Files: default.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: default.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/default.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** default.tmpl 11 Feb 2004 09:01:41 -0000 1.3 --- default.tmpl 20 Feb 2004 03:01:21 -0000 1.4 *************** *** 24,28 ****

    ! Results through of records.
    --- 24,28 ----

    ! Results through of records.
    From acli at users.sourceforge.net Fri Feb 20 04:01:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters aqbookfund.tmpl,1.20,1.21 aqbudget.tmpl,1.21,1.22 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/parameters Modified Files: aqbookfund.tmpl aqbudget.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: aqbookfund.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** aqbookfund.tmpl 9 Dec 2003 10:29:00 -0000 1.20 --- aqbookfund.tmpl 20 Feb 2004 03:01:21 -0000 1.21 *************** *** 5,9 **** !
    You Searched for


    --- 5,9 ---- !
    You Searched for


    Index: aqbudget.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** aqbudget.tmpl 11 Feb 2004 09:02:55 -0000 1.21 --- aqbudget.tmpl 20 Feb 2004 03:01:21 -0000 1.22 *************** *** 5,9 **** !
    You Searched for


    --- 5,9 ---- !
    You Searched for


    From acli at users.sourceforge.net Fri Feb 20 04:01:23 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:23 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/acqui Modified Files: acquire.tmpl Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** acquire.tmpl 11 Feb 2004 09:03:47 -0000 1.8 --- acquire.tmpl 20 Feb 2004 03:01:21 -0000 1.9 *************** *** 147,151 **** ! --- 147,151 ---- ! From acli at users.sourceforge.net Fri Feb 20 04:01:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 19:01:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes issues-top.inc,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2941/includes Modified Files: issues-top.inc Log Message: A few spelling and markup corrections (Probably a bit unnecessary adding quotes in issues-top.inc) Index: issues-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** issues-top.inc 11 Feb 2004 09:02:56 -0000 1.7 --- issues-top.inc 20 Feb 2004 03:01:21 -0000 1.8 *************** *** 240,266 **** --- 240,267 ---- *************** *** 271,301 **** --- 272,302 ---- *************** *** 326,331 ****
    !

    Logged in as: [Log Out]

    !

    Log In to Koha

    --- 327,332 ----
    !

    Logged in as: [Log Out]

    !

    Log In to Koha

    From acli at users.sourceforge.net Fri Feb 20 05:38:05 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 20:38:05 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.13,1.14 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18383 Modified Files: TmplTokenizer.pm Log Message: Support %0.0s notation so that we can omit the %s as in Year%s for the Chinese translation. (This won't work for all languages; ultimately the English templates must be fixed.) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** TmplTokenizer.pm 20 Feb 2004 02:48:39 -0000 1.13 --- TmplTokenizer.pm 20 Feb 2004 04:38:02 -0000 1.14 *************** *** 546,554 **** $fmt = $'; $it .= '%'; ! } elsif ($fmt =~ /^%(?:(\d+)\$)?s/) { $n += 1; ! my $i = (defined $1? $1: $n) - 1; $fmt = $'; ! $it .= $params[$i] } elsif ($fmt =~ /^%[^%a-zA-Z]*[a-zA-Z]/) { $fmt = $'; --- 546,560 ---- $fmt = $'; $it .= '%'; ! } elsif ($fmt =~ /^%(?:(\d+)\$)?(?:(\d+)(?:\.(\d+))?)?s/) { $n += 1; ! my($i, $width, $prec) = ((defined $1? $1: $n), $2, $3); $fmt = $'; ! if (!defined $width && !defined $prec) { ! $it .= $params[$i] ! } elsif (defined $width && defined $prec && !$width && !$prec) { ! ; ! } else { ! die "Unsupported precision specification in format: $&\n"; #XXX ! } } elsif ($fmt =~ /^%[^%a-zA-Z]*[a-zA-Z]/) { $fmt = $'; From acli at users.sourceforge.net Fri Feb 20 05:38:38 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 20:38:38 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,NONE,1.1 opac.zh_TW,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18555 Added Files: intranet.zh_TW opac.zh_TW Log Message: Preliminary checkin --- NEW FILE --- # Koha INTRANET module, traditional Chinese translation # Copyright (C) 2000-2004 Katipo Communications # This file is distributed under the same license as the Koha package. # Copyright 2004 Ambrose Li # msgid "" msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-19 17:20-0500\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl:29 #, c-format msgid "\" %s" [...7251 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:33 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:34 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:36 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:37 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:38 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:39 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:40 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:41 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:42 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:43 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:44 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:45 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:46 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:47 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:48 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:49 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" msgstr "" --- NEW FILE --- # Koha OPAC module, traditional Chinese translation # Copyright (C) 2000-2004 Katipo Communications # This file is distributed under the same license as the Koha package. # Copyright 2004 Ambrose Li # msgid "" msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" "Language-Team: Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:10 #, c-format msgid "" [...975 lines suppressed...] msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc:8 msgid "||" msgstr "" #~ msgid "BARCODE" #~ msgstr "??????" #~ msgid "Notes:" #~ msgstr "?????????" #~ msgid "Pages:" #~ msgstr "?????????" #~ msgid "Year :" #~ msgstr "??????" #~ msgid "You have" #~ msgstr "??????" From acli at users.sourceforge.net Fri Feb 20 07:16:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 22:16:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.7,1.8 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1235/koha-tmpl/intranet-tmpl/default/en Modified Files: about.tmpl Log Message: Minor capitalization correction Index: about.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** about.tmpl 9 Dec 2003 10:28:57 -0000 1.7 --- about.tmpl 20 Feb 2004 06:16:28 -0000 1.8 *************** *** 41,45 **** Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray and Turo Technology LLP, england (quality control, installer & updater)
    Nicolas Morin, French Translation
    --- 41,45 ---- Nicholas Rosasco, (Documentation Compiler)
    Mike Hansen
    ! MJ Ray and Turo Technology LLP, England (quality control, installer & updater)
    Nicolas Morin, French Translation
    From acli at users.sourceforge.net Fri Feb 20 08:04:15 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:04:15 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.1,1.2 opac.zh_TW,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9425 Modified Files: intranet.zh_TW opac.zh_TW Log Message: Updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** intranet.zh_TW 20 Feb 2004 04:38:36 -0000 1.1 --- intranet.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 *************** *** 36,40 **** #, c-format msgid "$%s" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:15 --- 36,40 ---- #, c-format msgid "$%s" ! msgstr "$%s" [...3835 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:37 msgid "z3950 search" ! msgstr "z3950??????" #: ../../koha-tmpl/intranet-tmpl/default/en/searchheader.tmpl:1 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl:6 msgid "|" ! msgstr "|" #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:9 *************** *** 7288,7290 **** #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" ! msgstr "" --- 7292,7294 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:50 msgid "||" ! msgstr "||" Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** opac.zh_TW 20 Feb 2004 04:38:36 -0000 1.1 --- opac.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 *************** *** 457,461 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:9 msgid "FINES & CHARGES" ! msgstr "?????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 457,461 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:9 msgid "FINES & CHARGES" ! msgstr "???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 From acli at users.sourceforge.net Fri Feb 20 08:13:24 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:13:24 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10716 Modified Files: intranet.zh_TW Log Message: Minor update (after changing TmplTokenizer.pm) Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** intranet.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 --- intranet.zh_TW 20 Feb 2004 07:13:21 -0000 1.3 *************** *** 2640,2644 **** #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:5 ! msgid "Data about the current version of Koha for bug reports (or general" msgstr "" --- 2640,2646 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:5 ! msgid "" ! "Data about the current version of Koha for bug reports (or general\n" ! "interest)." msgstr "" *************** *** 3286,3300 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:17 - msgid "Help" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:78 msgid "Henri-Damien Laurent" --- 3288,3291 ---- *************** *** 3574,3581 **** msgstr "??????" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:91 - msgid "Issues:" - msgstr "?????????" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:47 msgid "Issuing Question" --- 3565,3568 ---- *************** *** 3829,3833 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:166 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:78 msgid "Koha field" --- 3816,3819 ---- *************** *** 5488,5495 **** msgstr "??????" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:54 - msgid "Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine" - msgstr "Richard Anderson???Jeremy Blake???Rebecca Holden???Olive T. Canine" - #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:50 msgid "Rick Hansen Library" --- 5474,5477 ---- *************** *** 5986,5990 **** #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 ! msgid "The column" msgstr "" --- 5968,5976 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 ! msgid "" ! "The column Koha field shows that the subfield is linked with a Koha " ! "field. Koha can manage a MARC interface, or a Koha interface. This link " ! "ensures that both DB are synchronized, thus you can change from a MARC to a " ! "Koha interface easily." msgstr "" *************** *** 6172,6179 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:87 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:17 - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:90 msgid "Total" msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:32 --- 6158,6170 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:87 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:17 msgid "Total" msgstr "" + #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:90 + msgid "" + "Total\n" + "Issues:" + msgstr "????????????" + #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:35 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:32 *************** *** 6597,6601 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:10 ! msgid "You must create a new group for your item to be" msgstr "" --- 6588,6594 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:10 ! msgid "" ! "You must create a new group for your item to be\n" ! "added to" msgstr "" *************** *** 6691,6698 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:11 - msgid "added to" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:15 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:39 --- 6684,6687 ---- *************** *** 6703,6710 **** msgid "" "and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay " ! "Thompson, Gynn Lomax," msgstr "" "?????? Simon Blake???Amanda Atkins (????????????)???Olwen Williams???Finlay Thompson???" ! "Gynn Lomax???" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90 --- 6692,6700 ---- msgid "" "and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay " ! "Thompson, Gynn Lomax,\n" ! "\t\t\t\t\t\tRichard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine" msgstr "" "?????? Simon Blake???Amanda Atkins (????????????)???Olwen Williams???Finlay Thompson???" ! "Gynn Lomax???Richard Anderson???Jeremy Blake???Rebecca Holden???Olive T. Canine" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90 *************** *** 6867,6874 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:6 - msgid "interest)." - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:28 #, c-format --- 6857,6860 ---- *************** *** 7060,7064 **** #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:90 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:93 - #, fuzzy msgid "search" msgstr "??????" --- 7046,7049 ---- *************** *** 7068,7078 **** msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:72 - msgid "" - "shows that the subfield is linked with a Koha field. Koha can manage a MARC " - "interface, or a Koha interface. This link ensures that both DB are " - "synchronized, thus you can change from a MARC to a Koha interface easily." - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:60 msgid "slip" --- 7053,7056 ---- *************** *** 7207,7211 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:10 --- 7185,7188 ---- *************** *** 7215,7219 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:10 --- 7192,7195 ---- *************** *** 7223,7227 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:10 --- 7199,7202 ---- *************** *** 7231,7235 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:10 --- 7206,7209 ---- *************** *** 7239,7243 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc:11 --- 7213,7216 ---- *************** *** 7249,7253 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:10 --- 7222,7225 ---- *************** *** 7257,7261 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:9 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:10 --- 7229,7232 ---- *************** *** 7265,7269 **** #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:14 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:15 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:26 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:27 --- 7236,7239 ---- *************** *** 7293,7294 **** --- 7263,7278 ---- msgid "||" msgstr "||" + + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 + #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 + msgid "" + "|| \n" + "Help" + msgstr "" + From acli at users.sourceforge.net Fri Feb 20 08:10:05 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:10:05 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.14,1.15 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10129 Modified Files: TmplTokenizer.pm Log Message: Partially allow combination of several TEXT tokens. It seems that this gives better strings. (Always allowing combinations gives havoc, we currently avoid this by allowing combination only if the first and last tokens are both TEXT.) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** TmplTokenizer.pm 20 Feb 2004 04:38:02 -0000 1.14 --- TmplTokenizer.pm 20 Feb 2004 07:09:47 -0000 1.15 *************** *** 491,498 **** $it->set_form( $form ); $it->set_children( @structure ); ! # } elsif ($nonblank_text_p) { ! # # Combine the strings ! # my $string = join('', map { $_->string } @structure); ! # ; } else { # Requeue the tokens thus seen for re-emitting --- 491,498 ---- $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p && $structure[0]->type == TmplTokenType::TEXT && $structure[$#structure]->type == TmplTokenType::TEXT) { ! # Combine the strings ! my $string = join('', map { $_->string } @structure); ! $it = TmplToken->new($string, TmplTokenType::TEXT, $it->line_number, $it->pathname);; } else { # Requeue the tokens thus seen for re-emitting From acli at users.sourceforge.net Fri Feb 20 08:25:41 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:25:41 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac.zh_TW,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12550 Modified Files: opac.zh_TW Log Message: Minor updates Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** opac.zh_TW 20 Feb 2004 07:04:10 -0000 1.2 --- opac.zh_TW 20 Feb 2004 07:25:38 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- "(%s)" msgstr "" + "%s\n" + "(%s)" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:11 *************** *** 59,63 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 msgid "©" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 --- 61,65 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 msgid "©" ! msgstr "©" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 *************** *** 81,84 **** --- 83,88 ---- "%s    " msgstr "" + "??????\n" + "%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 *************** *** 145,149 **** #, c-format msgid "ISBN: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 --- 149,153 ---- #, c-format msgid "ISBN: %s" ! msgstr "?????????????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 *************** *** 155,179 **** #, c-format msgid "Item Type: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:79 #, c-format msgid "Item lost: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:37 #, c-format msgid "LCCN: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 ! #, fuzzy, c-format msgid "Last Borrower 1: %s" ! msgstr "???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:76 ! #, fuzzy, c-format msgid "Last Borrower 2: %s" ! msgstr "???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:73 --- 159,183 ---- #, c-format msgid "Item Type: %s" ! msgstr "?????????????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:79 #, c-format msgid "Item lost: %s" ! msgstr "?????????????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:37 #, c-format msgid "LCCN: %s" ! msgstr "LCCN: %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 ! #, c-format msgid "Last Borrower 1: %s" ! msgstr "?????????????????????1???%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:76 ! #, c-format msgid "Last Borrower 2: %s" ! msgstr "?????????????????????2???%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:73 *************** *** 202,206 **** #, c-format msgid "Notes: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:41 --- 206,210 ---- #, c-format msgid "Notes: %s" ! msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:41 *************** *** 287,291 **** #, c-format msgid "Year : %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:51 --- 291,295 ---- #, c-format msgid "Year : %s" ! msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:51 *************** *** 487,495 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:89 ! msgid "Issues:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 --- 491,495 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 *************** *** 640,644 **** "keyword will be used" msgstr "" ! "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:105 --- 640,645 ---- "keyword will be used" msgstr "" ! "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????" ! "?????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:105 *************** *** 840,845 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 ! msgid "Total" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 --- 841,848 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 ! msgid "" ! "Total\n" ! "Issues:" ! msgstr "??????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 *************** *** 912,923 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:90 ! #, fuzzy, c-format msgid "You have %s items currently issued." ! msgstr "????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:117 ! #, fuzzy, c-format msgid "You have %s items currently reserved." ! msgstr "????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:112 --- 915,926 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:90 ! #, c-format msgid "You have %s items currently issued." ! msgstr "??????????????? %s ??????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:117 ! #, c-format msgid "You have %s items currently reserved." ! msgstr "?????????????????? %s ??????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:112 *************** *** 944,948 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:10 msgid "Young Adult Fiction" ! msgstr "????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 --- 947,951 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:10 msgid "Young Adult Fiction" ! msgstr "???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 *************** *** 984,988 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 msgid "search" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 --- 987,991 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 msgid "search" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 *************** *** 999,1014 **** msgstr "" - #~ msgid "BARCODE" - #~ msgstr "??????" - - #~ msgid "Notes:" - #~ msgstr "?????????" - - #~ msgid "Pages:" - #~ msgstr "?????????" - - #~ msgid "Year :" - #~ msgstr "??????" - - #~ msgid "You have" - #~ msgstr "??????" --- 1002,1003 ---- From acli at users.sourceforge.net Fri Feb 20 08:52:35 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Thu, 19 Feb 2004 23:52:35 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.15,1.16 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16902 Modified Files: TmplTokenizer.pm Log Message: Fixed bug where a #cdata on one line won't be scanned properly. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** TmplTokenizer.pm 20 Feb 2004 07:09:47 -0000 1.15 --- TmplTokenizer.pm 20 Feb 2004 07:52:32 -0000 1.16 *************** *** 323,332 **** for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { ! if ($this->_peek_readahead =~ /^$cdata_close/) { ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_set_readahead( $' ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $this->_pop_readahead); $ok_p = 1; } --- 323,337 ---- for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { ! my $next = $this->_pop_readahead; ! if ($next =~ /^$cdata_close/) { ($kind, $it) = (TmplTokenType::TAG, $&); ! $this->_push_readahead( $' ); ! $ok_p = 1; ! } elsif ($next =~ /^((?:(?!$cdata_close).)+)($cdata_close)/) { ! ($kind, $it) = (TmplTokenType::TEXT, $1); ! $this->_push_readahead( "$2$'" ); $ok_p = 1; } else { ! ($kind, $it) = (TmplTokenType::TEXT, $next); $ok_p = 1; } *************** *** 447,451 **** } else { $it = $this->_next_token_intermediate($h); ! if ($this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? !blank_p( $it->string ): _token_groupable_p( $it ))) { --- 452,456 ---- } else { $it = $this->_next_token_intermediate($h); ! if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? !blank_p( $it->string ): _token_groupable_p( $it ))) { From acli at users.sourceforge.net Fri Feb 20 10:32:18 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Fri, 20 Feb 2004 01:32:18 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3527 Modified Files: intranet.zh_TW Log Message: Updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** intranet.zh_TW 20 Feb 2004 07:13:21 -0000 1.3 --- intranet.zh_TW 20 Feb 2004 09:32:14 -0000 1.4 *************** *** 18,22 **** #, c-format msgid "\" %s" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:41 --- 18,22 ---- #, c-format msgid "\" %s" ! msgstr "\" %s" [...1688 lines suppressed...] #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl:6 *************** *** 7159,7163 **** #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:218 msgid "update" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:108 --- 7104,7108 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:218 msgid "update" ! msgstr "??????" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:108 *************** *** 7276,7278 **** "Help" msgstr "" - --- 7221,7222 ---- From tipaul at users.sourceforge.net Fri Feb 20 11:35:02 2004 From: tipaul at users.sourceforge.net (Paul POULAIN) Date: Fri, 20 Feb 2004 02:35:02 -0800 Subject: [Koha-cvs] CVS: koha/C4 Catalogue.pm,1.38,1.39 Message-ID: Update of /cvsroot/koha/koha/C4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15487/C4 Modified Files: Catalogue.pm Log Message: bugfix (wrong synch with rel_2_0) Index: Catalogue.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** Catalogue.pm 11 Feb 2004 08:40:10 -0000 1.38 --- Catalogue.pm 20 Feb 2004 10:34:59 -0000 1.39 *************** *** 99,114 **** my ($basketno,$supplier)=@_; my $dbh = C4::Context->dbh; ! my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblio,biblioitems ! where basketno=? and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber =aqorders.biblioitemnumber and (datecancellationprinted is NULL or datecancellationprinted = ! '0000-00-00')" ! .(($supplier ne '')?" and aqorders.booksellerid=?":"") ! ." group by aqorders.ordernumber"); ! if ($supplier ne '') { ! $sth->execute($basketno,$supplier); ! } else { ! $sth->execute($basketno); } $query.=" order by biblioitems.publishercode"; --- 99,110 ---- my ($basketno,$supplier)=@_; my $dbh = C4::Context->dbh; ! my $query="Select *,biblio.title from aqorders,biblio,biblioitems ! where basketno='$basketno' and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber =aqorders.biblioitemnumber and (datecancellationprinted is NULL or datecancellationprinted = ! '0000-00-00')"; ! if ($supplier ne ''){ ! $query.=" and aqorders.booksellerid='$supplier'"; } $query.=" order by biblioitems.publishercode"; *************** *** 119,126 **** my $i=0; while (my $data=$sth->fetchrow_hashref){ ! push(@results,$data); } $sth->finish; ! return(scalar(@results), at results); } --- 115,123 ---- my $i=0; while (my $data=$sth->fetchrow_hashref){ ! $results[$i]=$data; ! $i++; } $sth->finish; ! return($i, at results); } From kb2qzv at poczta.wp.pl Fri Feb 20 13:39:22 2004 From: kb2qzv at poczta.wp.pl (Benedykt P. Barszcz) Date: Fri, 20 Feb 2004 13:39:22 +0100 Subject: [Koha-cvs] npl theme gorgeuos Message-ID: <1077280762.3248.17.camel@localhost.localdomain> Hi, gorgeous gorgeous gorgeous it is !!! Congrats on the new theme for the intranet interface. What I love out right is the explanation column... It's really informative. I didn't have a chance to find bugs but I like it a lot. thanks for this. I will work on translating it soon. Benedict From kb2qzv at users.sourceforge.net Sat Feb 21 14:07:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 05:07:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl subject.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16316/koha-tmpl/opac-tmpl/default/pl Modified Files: subject.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- subject.tmpl 21 Feb 2004 13:07:55 -0000 1.3 *************** *** 1,44 **** ! ! ! !

    Zalogowano jako: [Wyloguj si?]

    ! !

    Zaloguj si? do Koha

    !     ! !
    ! !
    AUTHOR QtyRecieved
    AUTHOR QtyReceived
    ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Przedmiot
    >
     

    ! Trafienia od do z rekord?w.
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Przedmiot
    ">
     

    ! Rekordy od do z znalezionych.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From kb2qzv at users.sourceforge.net Sat Feb 21 16:49:50 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 07:49:50 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl subject.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14054/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 subject.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: subject.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/subject.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** subject.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- subject.tmpl 21 Feb 2004 15:49:48 -0000 1.2.2.1 *************** *** 1,44 **** ! ! ! !

    Zalogowano jako: [Wyloguj si?]

    ! !

    Zaloguj si? do Koha

    ! ! !
    ! ! ! /images/background-opac.gif> ! ! ! ! /images/background-opac.gif>
    Przedmiot
    >
     

    ! Trafienia od do z rekord?w.
    ! ! &=>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=>/images/numbers/.gif border=0> ! ! ! ! &=>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! --- 1,35 ---- ! ! ! /images/background-opac.gif"> ! ! ! ! /images/background-opac.gif">
    Przedmiot
    ">
     

    ! Rekordy od do z znalezionych.
    ! ! &=">/images/numbers/prev.gif" width="15" height="14" border="0" alt="Previous Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! ! ! ! /images/numbers/-highlight.gif" width="15" height="14" border="0" alt=""> ! ! &=">/images/numbers/.gif" width="15" height="14" border="0" alt=""> ! ! ! ! &=">/images/numbers/next.gif" width="15" height="14" border="0" alt="Next Page"> ! ! /images/numbers/placeholder.gif" width="15" height="14" border="0" alt=""> ! *************** *** 47,49 **** ! --- 38,40 ---- ! From kb2qzv at users.sourceforge.net Sat Feb 21 16:50:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sat, 21 Feb 2004 07:50:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-userupdate.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14233/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-userupdate.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-userupdate.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-userupdate.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-userupdate.tmpl 3 Oct 2003 20:04:18 -0000 1.3 --- opac-userupdate.tmpl 21 Feb 2004 15:50:54 -0000 1.3.2.1 *************** *** 1,56 **** ! ! !

    Zalogowano jako: [Wyloguj si?]

    ! !

    Zaloguj si? do Koha

    !     ! Prosz? nanie?? potrzebne zmiany. Biblioteka otrzyma wiadomo?? e-mailem.
    ! Zmiany te nie uka?? si? dop?ki biblioteka ich nie zatwierdzi..

    ! !
    !
    ! ! ! ! ! ! ! ! ! - - ! ! ! ! - - ! ! ! !
    Nazwisko
    Tytu?
    Imi?
    Ulica
    Miasto
    Tel. domowy
    Tel./Fax w pracy
    Email
    !
    !
    !
    !     ! ! \ No newline at end of file --- 1,47 ---- ! !

    Prosimy wprowadzi?? konieczne zmiany. Biblioteka otrzyma powiadomienie listem elektronicznym.
    ! Zmiany uka???? si?? dopiero po uwierzytelnieniu ich przez Bibliotek??.

    ! !
    ! ! ! ! ! ! ! ! ! ! ! + + ! ! ! ! + + + !
    Nazwisko " name="surname">
    Tytu?? " name="title">
    Imi?? " name="firstname">
    Adres " name="streetaddress">
    Miasto " name="city">
    Tel. domowy " name="phone">
    Tel/fax praca " name="faxnumber">
    Email " name="emailaddress">
    !
    ! ! From acli at users.sourceforge.net Sun Feb 22 06:18:55 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 21:18:55 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.16,1.17 tmpl_process3.pl,1.2,1.3 xgettext.pl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31961 Modified Files: TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Handle the iso8859-1 charset somewhat, so that when the po file is in either iso8859-1 or utf8, msgmerge(1) won't crap out. The code is ugly; the conversion table is hard-coded, and in some place not very appropriate. However, this does fix the case where a few strings containing French characters can't be translated. As a side effect, tmpl_process3 can now also be used for French or other languages using iso8859-1. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** TmplTokenizer.pm 20 Feb 2004 07:52:32 -0000 1.16 --- TmplTokenizer.pm 22 Feb 2004 05:18:52 -0000 1.17 *************** *** 540,544 **** } ! # Complication function that shouldn't be here sub parametrize ($@) { my($fmt, @params) = @_; --- 540,544 ---- } ! # Some functions that shouldn't be here... should be moved out some time sub parametrize ($@) { my($fmt, @params) = @_; *************** *** 573,576 **** --- 573,584 ---- } + sub charset_canon ($) { + my($charset) = @_; + $charset = uc($charset); + $charset = "$1-$2" if $charset =~ /^(ISO|UTF)(\d.*)/i; + $charset = 'Big5' if $charset eq 'BIG5'; # "Big5" must be in mixed case + return $charset; + } + ############################################################################### Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** tmpl_process3.pl 19 Feb 2004 21:28:14 -0000 1.2 --- tmpl_process3.pl 22 Feb 2004 05:18:52 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- use vars qw( $href ); use vars qw( $type ); # file extension (DOS form without the dot) to match + use vars qw( $charset_in $charset_out ); ############################################################################### *************** *** 99,103 **** } - # FIXME: Should we use the GNOME convention of using POTFILES.in instead? sub listfiles ($$) { my($dir, $type) = @_; --- 100,103 ---- *************** *** 147,150 **** --- 147,156 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; + # keep the buggy Locale::PO quiet if it says stupid things + $SIG{__WARN__} = sub { + my($s) = @_; + print STDERR $s unless $s =~ /^Strange line in [^:]+: #~/s + }; + my $action = shift or usage_error('You must specify an ACTION.'); usage_error('You must at least specify input and string list filenames.') *************** *** 180,192 **** } if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; ! system {'./xgettext.pl'} ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; --- 186,221 ---- } + # restores the string list from file + $href = Locale::PO->load_file_ashash($str_file); + + # guess the charsets. HTML::Templates defaults to iso-8859-1 + if (defined $href) { + $charset_out = TmplTokenizer::charset_canon $2 + if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/; + for my $msgid (keys %$href) { + if ($msgid =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/) { + my $candidate = TmplTokenizer::charset_canon $2; + die "Conflicting charsets in msgid: $charset_in vs $candidate\n" + if defined $charset_in && $charset_in ne $candidate; + $charset_in = $2; + } + } + } + if (!defined $charset_in) { + $charset_in = TmplTokenizer::charset_canon 'iso8859-1'; + warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n"; + } + if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); + # Generate the temporary file that acts as /POTFILES.in for my $input (@in_files) { print $tmph "$input\n"; } close $tmph; ! # Generate the specified po file ($str_file) ! system ('xgettext.pl', '-s', '-f', $tmpfile, '-o', $str_file); unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; *************** *** 195,203 **** my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; ! system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2); system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; --- 224,239 ---- my($tmph2, $tmpfile2) = tmpnam(); close $tmph2; # We just want a name + # Generate the temporary file that acts as /POTFILES.in for my $input (@in_files) { print $tmph1 "$input\n"; } close $tmph1; ! # Generate the temporary file that acts as /.pot ! system('./xgettext.pl', '-s', '-f', $tmpfile1, '-o', $tmpfile2, ! (defined $charset_in? ('-I', $charset_in): ()), ! (defined $charset_out? ('-O', $charset_out): ())); ! # Merge the temporary "pot file" with the specified po file ($str_file) ! # FIXME: msgmerge(1) is a Unix dependency ! # FIXME: need to check the return value system('msgmerge', '-U', '-s', $str_file, $tmpfile2); unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; *************** *** 222,228 **** close INPUT; - # restores the string list from file - $href = Locale::PO->load_file_ashash($str_file); - # creates the new tmpl file using the new translation for my $input (@in_files) { --- 258,261 ---- Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** xgettext.pl 19 Feb 2004 21:24:30 -0000 1.1 --- xgettext.pl 22 Feb 2004 05:18:52 -0000 1.2 *************** *** 13,19 **** use VerboseWarnings; use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); ! use vars qw( %text ); ############################################################################### --- 13,60 ---- use VerboseWarnings; + use vars qw( $convert_from ); use vars qw( $files_from $directory $output $sort ); use vars qw( $pedantic_p ); ! use vars qw( %text %translation ); ! use vars qw( $charset_in $charset_out ); ! ! ############################################################################### ! ! use vars qw( @latin1_utf8 ); ! @latin1_utf8 = ( ! "\302\200", "\302\201", "\302\202", "\302\203", "\302\204", "\302\205", ! "\302\206", "\302\207", "\302\210", "\302\211", "\302\212", "\302\213", ! "\302\214", "\302\215", undef, undef, "\302\220", "\302\221", ! "\302\222", "\302\223", "\302\224", "\302\225", "\302\226", "\302\227", ! "\302\230", "\302\231", "\302\232", "\302\233", "\302\234", "\302\235", ! "\302\236", "\302\237", "\302\240", "\302\241", "\302\242", "\302\243", ! "\302\244", "\302\245", "\302\246", "\302\247", "\302\250", "\302\251", ! "\302\252", "\302\253", "\302\254", "\302\255", "\302\256", "\302\257", ! "\302\260", "\302\261", "\302\262", "\302\263", "\302\264", "\302\265", ! "\302\266", "\302\267", "\302\270", "\302\271", "\302\272", "\302\273", ! "\302\274", "\302\275", "\302\276", "\302\277", "\303\200", "\303\201", ! "\303\202", "\303\203", "\303\204", "\303\205", "\303\206", "\303\207", ! "\303\210", "\303\211", "\303\212", "\303\213", "\303\214", "\303\215", ! "\303\216", "\303\217", "\303\220", "\303\221", "\303\222", "\303\223", ! "\303\224", "\303\225", "\303\226", "\303\227", "\303\230", "\303\231", ! "\303\232", "\303\233", "\303\234", "\303\235", "\303\236", "\303\237", ! "\303\240", "\303\241", "\303\242", "\303\243", "\303\244", "\303\245", ! "\303\246", "\303\247", "\303\250", "\303\251", "\303\252", "\303\253", ! "\303\254", "\303\255", "\303\256", "\303\257", "\303\260", "\303\261", ! "\303\262", "\303\263", "\303\264", "\303\265", "\303\266", "\303\267", ! "\303\270", "\303\271", "\303\272", "\303\273", "\303\274", "\303\275", ! "\303\276", "\303\277" ); ! ! sub charset_convert ($) { ! my($s) = @_; ! if ($s !~ /[\200-\377]/s) { # FIXME: don't worry about iso2022 for now ! ; ! } elsif ($charset_in eq 'ISO-8859-1' && $charset_out eq 'UTF-8') { ! $s =~ s/[\200-\377]/ $latin1_utf8[ord($&) - 128] /egs; ! } elsif ($charset_in ne $charset_out) { ! VerboseWarnings::warn_normal "conversion from $charset_in to $charset_out is not supported\n", undef; ! } ! return $s; ! } ############################################################################### *************** *** 88,91 **** --- 129,134 ---- sub generate_po_file () { # We don't emit the Plural-Forms header; it's meaningless for us + my $pot_charset = (defined $charset_out? $charset_out: 'CHARSET'); + $pot_charset = TmplTokenizer::charset_canon $pot_charset; print OUTPUT <\\n" "MIME-Version: 1.0\\n" ! "Content-Type: text/plain; charset=CHARSET\\n" "Content-Transfer-Encoding: 8bit\\n" --- 146,150 ---- "Language-Team: LANGUAGE \\n" "MIME-Version: 1.0\\n" ! "Content-Type: text/plain; charset=$pot_charset\\n" "Content-Transfer-Encoding: 8bit\\n" *************** *** 114,123 **** my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; ! printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( $t ); ! printf OUTPUT "msgstr \"\"\n\n"; } } --- 157,207 ---- my $pathname = $token->pathname; $pathname =~ s/^$directory_re//os; ! printf OUTPUT "#: %s:%d\n", $pathname, $token->line_number ! if defined $pathname && defined $token->line_number; $cformat_p = 1 if $token->type == TmplTokenType::TEXT_PARAMETRIZED; } printf OUTPUT "#, c-format\n" if $cformat_p; ! printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po( charset_convert $t ); ! printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? ! TmplTokenizer::quote_po( $translation{$t} ): "\"\""); ! } ! } ! ! ############################################################################### ! ! sub convert_translation_file () { ! open(INPUT, "<$convert_from") || die "$convert_from: $!\n"; ! VerboseWarnings::set_input_file_name $convert_from; ! while () { ! chomp; ! my($msgid, $msgstr) = split(/\t/); ! die "$convert_from: $.: Malformed tmpl_process input (no tab)\n" ! unless defined $msgstr; ! ! # Fixup some of the bad strings ! $msgid =~ s/^SELECTED>//; ! ! # Create dummy token ! my $token = TmplToken->new( $msgid, TmplTokenType::UNKNOWN, undef, undef ); ! remember( $token, $msgid ); ! $msgstr =~ s/^(?:LIMIT;|LIMITED;)//g; # unneeded for tmpl_process3 ! $translation{$msgid} = $msgstr unless $msgstr eq '*****'; ! ! if ($msgid =~ /\bcharset=(["']?)([^;\s"']+)\1/s) { ! my $candidate = TmplTokenizer::charset_canon $2; ! die "Conflicting charsets in msgid: $candidate vs $charset_in\n" ! if defined $charset_in && $charset_in ne $candidate; ! $charset_in = $candidate; ! } ! if ($msgstr =~ /\bcharset=(["']?)([^;\s"']+)\1/s) { ! my $candidate = TmplTokenizer::charset_canon $2; ! die "Conflicting charsets in msgid: $candidate vs $charset_out\n" ! if defined $charset_out && $charset_out ne $candidate; ! $charset_out = $candidate; ! } ! } ! if (!defined $charset_in) { ! $charset_in = $charset_out = TmplTokenizer::charset_canon 'iso8859-1'; ! warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n"; } } *************** *** 165,171 **** --- 249,259 ---- Getopt::Long::config qw( bundling no_auto_abbrev ); GetOptions( + 'charset=s' => sub { $charset_in = $charset_out = $_[1] }, # INTERNAL + 'convert-from=s' => \$convert_from, 'D|directory=s' => \$directory, 'f|files-from=s' => \$files_from, + 'I|input-charset=s' => \$charset_in, # INTERNAL 'pedantic-warnings|pedantic' => sub { $pedantic_p = 1 }, + 'O|output-charset=s' => \$charset_out, # INTERNAL 'output|o=s' => \$output, 's|sort-output' => sub { $sort = 's' }, *************** *** 177,183 **** VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') unless defined $files_from; $directory = '.' unless defined $directory; if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; --- 265,275 ---- VerboseWarnings::set_pedantic_mode $pedantic_p; ! usage_error('Missing mandatory option -f') ! unless defined $files_from || defined $convert_from; $directory = '.' unless defined $directory; + usage_error('You cannot specify both --convert-from and --files-from') + if defined $convert_from && defined $files_from; + if (defined $output && $output ne '-') { open(OUTPUT, ">$output") || die "$output: $!\n"; *************** *** 186,198 **** } ! open(INPUT, "<$files_from") || die "$files_from: $!\n"; ! while () { ! chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); ! $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! text_extract( $h ); } - close INPUT; generate_po_file; --- 278,294 ---- } ! if (defined $files_from) { ! open(INPUT, "<$files_from") || die "$files_from: $!\n"; ! while () { ! chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); ! $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! text_extract( $h ); ! } ! close INPUT; ! } else { ! convert_translation_file; } generate_po_file; From acli at users.sourceforge.net Sun Feb 22 07:04:08 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sat, 21 Feb 2004 22:04:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_105.tmpl,1.2,1.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6386 Modified Files: unimarc_field_105.tmpl Log Message: Some French letters were ? Index: unimarc_field_105.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** unimarc_field_105.tmpl 11 Feb 2004 09:01:41 -0000 1.2 --- unimarc_field_105.tmpl 22 Feb 2004 06:04:05 -0000 1.3 *************** *** 12,19 ****
    Code date publication --- 12,19 ----
    Code date publication *************** *** 21,29 ****
    Ann?e d?but ">
    Ann?e fin ">
    Ann?e d?but ">
    Ann?e fin ">
    /images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
    /images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
    CONFIRM DELETION of this entry and all entries depending from this one
    CONFIRM DELETION of this entry and all entries depending on this one
    ! ! ! ! ! ! --- 44,53 ----
    /images/background-mem.gif">Request/images/background-mem.gif">Item type/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! ! ! ! ! From acli at users.sourceforge.net Sun Feb 22 10:04:58 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 01:04:58 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.20,1.21 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2759 Modified Files: TmplTokenizer.pm Log Message: Try to relax the criteria for allowing groups of tokens without TMPL_VAR to be combined together into one string. This seems to have the desired effect (that "foo bar" type strings are now recognized in one piece). However, "

    foo

    \nexplanation"-type things may now also be (arguably wrongly) recognized as one piece. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** TmplTokenizer.pm 22 Feb 2004 08:18:27 -0000 1.20 --- TmplTokenizer.pm 22 Feb 2004 09:04:53 -0000 1.21 *************** *** 460,466 **** && $structure[$#structure]->string =~ /^<\//s) { my $has_other_tags_p = 0; - printf STDERR "last token %d is type %s: %s\n", $#structure, $structure[$#structure]->type->to_string, $structure[$#structure]->string; for (my $i = 0; $i < $#structure; $i += 1) { - printf STDERR "token %d is type %s: %s\n", $i, $structure[$i]->type->to_string, $structure[$i]->string; $has_other_tags_p = 1 if $structure[$i]->type == TmplTokenType::TAG; last if $has_other_tags_p; --- 460,464 ---- *************** *** 479,482 **** --- 477,504 ---- } + sub looks_plausibly_like_groupable_text_p (@) { + my @structure = @_; + # The text would look plausibly groupable if all open tags are also closed. + my @tags = (); + my $error_p = 0; + for (my $i = 0; $i <= $#structure; $i += 1) { + if ($structure[$i]->type == TmplTokenType::TAG) { + if ($structure[$i]->string =~ /^<([A-Z0-9]+)/i) { + push @tags, lc($1); + } elsif ($structure[$i]->string =~ /^<\/([A-Z0-9]+)/i) { + if (@tags && lc($1) eq $tags[$#tags]) { + pop @tags; + } else { + $error_p = 1; + } + } + } elsif ($structure[$i]->type != TmplTokenType::TEXT) { + $error_p = 1; + } + last if $error_p; + } + return !$error_p && !@tags; + } + sub next_token { my $this = shift; *************** *** 484,487 **** --- 506,512 ---- my $it; $this->{_queue} = [] unless defined $this->{_queue}; + + # Don't reparse anything in the queue. We can put a parametrized token + # there if we need to, however. if (@{$this->{_queue}}) { $it = pop @{$this->{_queue}}; *************** *** 533,537 **** $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p && $structure[0]->type == TmplTokenType::TEXT && $structure[$#structure]->type == TmplTokenType::TEXT) { # Combine the strings my $string = join('', map { $_->string } @structure); --- 558,564 ---- $it->set_form( $form ); $it->set_children( @structure ); ! } elsif ($nonblank_text_p ! && looks_plausibly_like_groupable_text_p( @structure ) ! && $structure[$#structure]->type == TmplTokenType::TEXT) { # Combine the strings my $string = join('', map { $_->string } @structure); From kb2qzv at users.sourceforge.net Sun Feb 22 18:06:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:06:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-search.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7734/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-search.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-search.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-search.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-search.tmpl 1 Oct 2003 12:46:58 -0000 1.3 --- opac-search.tmpl 22 Feb 2004 17:06:55 -0000 1.3.2.1 *************** *** 1,92 **** ! ! !

    Zalogowano jako: [Strony cz?onkowskie][Wyloguj]

    ! !

    Zaloguj si? do Koha

    !     ! ! !
    !
    !
    /images/background-mem.gif">Request/images/background-mem.gif">Item type/images/background-mem.gif">Classification/images/background-mem.gif">Volume/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! -
    S?owa kluczowe
    LUB :
    Przedmiot
    LUB jedno albo wi?cej z :
    Tytu?NormalnePrecyzyjne
    Autor
    Ilustrator
    Klasa ! !
    Kod kreskowy
    Zauwa?, ?e je?li wpiszesz jak?? warto?? do S?owa kluczowe, oraz inn? gdzie indziej to u?yta zostanie jedynie warto?? S?owa kluczowego
    ! ! ! --- 1,71 ---- ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    S??owo-kluczowe
    LUB :
    Przedmiot
    LUB jedno albo kilka z :
    Tytu??Zwyk??eDok??adne
    Autor
    Ilustrator
    Typ ! !
    Kod paskowy
    Gdy wprowadzisz warto???? w S??owo-klucz oraz warto???? gdzie inndziej, to jedynie S??owo-klucz b??dzie wzi??te pod uwag??
    ! !
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:06:33 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:06:33 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-user.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7631/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-user.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-user.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-user.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-user.tmpl 3 Oct 2003 20:04:18 -0000 1.4 --- opac-user.tmpl 22 Feb 2004 17:06:30 -0000 1.4.2.1 *************** *** 1,131 **** ! ! ! ! ! ! !
    CZY NASZ REKORD JEST POPRAWNY?
    ! Karta dost?pu:

    ! ()
    ! ,
    ! (dom)
    ! (praca)
    ! !

    ! ! Czy kt?rekolwiek z naszych danych s? niepoprawne? Czy ostatnio przeprowadza?e?/a? si?, zmieni?e?/a? numer telefonu lub adres e-mail?

    ! ! Zaktualizuj dane ! !

    ! ! ! ! Witaj ! [Wyloguj si?]

    ! ! ! ! ! !
    ! Masz niezap?acone nale?no?ci i kary w wysoko?ci !
    ! !     ! ! ! ! !
    Masz niezap?acone nale?no?ci i kary w wysoko?ci !
    !     ! ! ! ! !
    Posiadasz kredyt na !
    !     ! Przegl?daj konta ! ! ! ! ! ! ! ! ! !
    ! Czekaj? na Ciebie zarezerwowane pozycje: !

    odbi?r w:
    !     ! !

    ! ! ! ! Obecnie masz wypo?yczonych pozycji
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    tytu?AutorDo zwrotuTyp pozycjiOp?atyBie??cy Status
    TakNieTakNie
    - - Nie masz ?adnej wypo?yczonej pozycji. -     - -

    - - - - - Obecnie masz zarezerwowan?(ych) pozycj?(i).
    - - - - - - - - - - - - - - - - - - -
    Tytu?AutorData rezerwacji
    -     ! --- 1,135 ---- ! ! ! ! ! ! ! ! !
    CZY NASZE DANE S?? POPRAWNE?
    Numer karty:
    ! ()
    ! ,
    ! (hm)
    ! (wk)
    !
    !
    Zmieni??o si?? co???

    ! Wprowad?? zmiany !     !
    + + + + + +
    + Masz outstanding charges and fines z +
    + + + + + + + +
    + + Masz outstanding charges and fines z + +
    + + + + + + + +
    + + Masz a credit z + +
    + +

    Przejrzyj rachunki

    + + + + + + + + + /images/background-opac.gif"> + + + + + + + + + + +
    + + Masz reserved items waiting: + +
    Tytu??AutorDzie?? rezerwacjiPick Up Branch
    + ">  +

     

    + + + + + + +

    Masz wypo??yczone pozycje.

    + + /images/background-opac.gif"> + + + + + + + + + + + + + + + + + +
    Tytu??AutorZwrot dniaTypOp??atyKredyt
    "> YesNoYesNo
    + +

    Nie masz ??adnych wypo??ycznych pozycji.

    + + + + +

    Masz zarezerwowane pozycje.

    + + /images/background-opac.gif"> + + + + + + + + + + + +
    Tytu??AutorDzie?? rezerwacji
    "> 
    + ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:26 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:26 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-reserve.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7894/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-reserve.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-reserve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-reserve.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-reserve.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-reserve.tmpl 22 Feb 2004 17:07:23 -0000 1.4.2.1 *************** *** 1,112 **** ! !
    ! !

    Zalogowano jako: [Strony cz?onkowskie][Wyloguj si?]

    ! !

    Zaloguj si? do Koha

    !     ! ! ! !
    ! Przepraszamy, nie mo?esz z?ozy? zam?wienia poniewa? zalegasz na . ! Przepraszamy, nie mo?esz z?o?y? wi?cej jak rezerwacji. ! Z?o?y?e?/a? ju? zam?wienie na t? pozycj?. ! Musisz wybra? przynajmniej jeden typ pozycji! ! Musisz poda? oddzia? do odbioru! !

    !     ! !

    Strona rezerwacji dla pozycji: ( )

    !

    Z?o?ono ju? zam?wie? na t? pozycj?.

    !

    Prosimy wybra?, kt?ry typ pozycji Ci? interesuje. Pierwsza z pozycji, kt?ra stanie si? dost?pna a nale?y do jednego z tych typ?w zostanie dla Ciebie zatrzymana. ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Zam?wienieTyp PozycjiEgzemplarze
    Rezerwacja nie mo?liwa
    !

    ! Prosimy wybra? oddzia?, z kt?rego chcesz odebra? pozycj?: !

    ! ! ! ! !
    Rezerwacja tego dnia: ! ! ! !
    Koniec rezerwacji tego dnia: ! ! ! !
    !

    ! !

    !     ! !

    Prosimy potwierdzi?, ?e chcesz zam?wi? pozycj? typu:

    !

    ! ! ! ! ! ! ! ! ! ! !
    Typ Pozycji
    ! kt?ra ma by? podj?ta .
    ! ! !
    Uwaga, b?dzie pobrana op?ata w wysoko?ci PLN
    !     ! !
    !     --- 1,113 ---- ! !
    ! ! !
    ! Sorry, you cannot make reserves because you owe .
    ! Sorry, you cannot make more than reserves.
    ! Ju?? posiadasz rezerwacj?? na t?? pozycj??.
    ! You must select at least one item type!
    ! You must select a branch for pickup!
    !
    ! ! !

    Strona rezerwacji dla pozycji: ( )

    !

    Istnieje rezerwacji na t?? pozycj??.

    !

    Prosimy wybra?? ????dany typ pozycji. Pierwszy z typ??w, kt??ry stanie si?? dost??pny zostanie dla Ciebie zarezerwowany.

    ! !
    ! ! "> ! ! /images/background-opac.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Zam??wTyp pozycjiCopies
    ">Cannot be Reserved

    ! Prosimy wybra?? oddzia??, z kt??rego nast??pi odbi??r pozycji: ! !

    ! ! ! ! !
    Rezerwacja tego dnia: ! ! ! !
    Rezygnacja tego dnia: ! ! ! !
    !

    !
    ! ! !

    Prosimy o potwierdzenie rezerwacji:

    !
    ! ! "> ! "> ! ! ! ! ! ! !
    /images/background-opac.gif">Typ pozycji
    ">
    ! kt??rej odbi??r nast??pi z .
    ! "> ! !

    Uwaga, pobrana zostanie op??ata w wysoko??ci $

    ! ! !
    ! ! !
    + \ No newline at end of file From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:40 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:40 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-moredetail.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7970/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-moredetail.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-moredetail.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-moredetail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-moredetail.tmpl 22 Feb 2004 17:07:37 -0000 1.4.2.1 *************** *** 1,53 **** !
    - -

    Zalogowano jako: [Strony cz?onkowskie][Wyloguj]

    - -

    Zaloguj si? do Koha

    -     -
    ! ! ! ! &type=intra> ! ()

    ! > ! > --- 1,47 ---- !

    ! ! ! ! &type=intra> ! ()

    ! > ! >

    GROUP -
    ! !
    ! Biblionumber:
    ! Typ Pozycji:
    ! URL:
    ! Czas wypo?yczenia:
    ! Op?ata za wypo?yczenie:
    ! Klasyfikacja:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilustr:
    ! Rozmiar:
    ! Notki:
    ! Liczba pozycji:
    *************** *** 55,99 ****
    GROUP -
    ! !
    ! Biblionumber:
    ! Typ pozycji:
    ! URL:
    ! Loan Length:
    ! Rental Charge:
    ! Classification:
    ! ISBN:
    ! Publisher:
    ! Place:
    ! Date:
    ! Volume:
    ! Pages:
    ! Illus:
    ! Size:
    ! Notes:
    ! No. z Items:
    !     !
    BARCODE !
    ! > ! > ! > ! !
    ! Home Branch:
    ! Ostatnio zdano:
    ! Ostatnio po?yczono:
    ! issue bit ! Ostatni czytelnik 1:
    ! Ostatni czytelnik 2:
    ! Bie??cy oddzia?:
    ! Cena wymiany:
    ! Pozycja zagubiona:
    ! Paid for:
    ! Notki:
    ! Przed?u?enia:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Anulowano:
    &bi=&itm=>Total ! Issues:
    ! Group Number:
    ! Biblio number:
    --- 49,93 ----
    ! !
    BARCODE !
    ! > ! > ! > ! !
    ! Home Branch:
    ! Last seen:
    ! Last borrowed:
    ! on issue bit ! Last Borrower 1:
    ! Last Borrower 2:
    ! Current Branch:
    ! Replacement Price:
    ! Item lost:
    ! Paid for:
    ! Notes:
    ! Renewals:
    ! &biblio=&invoice=&catview=yes"> Accession ! Date:
    ! Cancelled:
    &bi=&itm=>Total ! Issues:
    ! Group Number:
    ! Biblio number:
    *************** *** 104,108 ****
    !

    --- 98,102 ----

    !

    *************** *** 110,112 **** ! --- 104,106 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:54 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:54 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-main.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8003/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-main.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-main.tmpl 3 Oct 2003 20:04:18 -0000 1.4 --- opac-main.tmpl 22 Feb 2004 17:07:51 -0000 1.4.2.1 *************** *** 1,135 **** ! ! Katalog Publiczny systemu KOHA ! ! ! ! ! ! !

    ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !

    ! Koha: Horowhenua Library Trust Catalogue and Member Services    		Szukaj w Katalogu
       
    ! !
    ! ! Wype?nij pole i naci?nij klawisz ENTER.
    ! ! ! -Wyszukiwanie zaawansowane (wi?cej opcji).
    ! ! !

    ! !

    Zalogowano jako: [Strony cz?onkowskie][Wyloguj]

    ! !

    Zaloguj si? do Koha

    ! !
    ! !
    !

    !

    --- 1,128 ---- ! ! ! ! ! WELCOME TO THE KOHA OPAC + + ! ! ! !
    /images/front-background-med.gif"> ! /images/holder.gif" alt="" width="1" height="440" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/holder.gif" alt="" width="260" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="30" height="88" hspace="0" vspace="0" border="0">/images/holder.gif" alt="" width="350" height="88" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" alt="" width="1" height="30" hspace="0" vspace="0" border="0"> ! ! !        /images/front-arrow.gif" alt="" border="0" width="27" height="22"> ! ! ! Szukaj w katalogu ! !
    ! !
    ! Wpisz s??owo i naci??nij Enter.
    ! ! /images/front-arrow-small.gif" alt="-" width="20" height="16" hspace="0" vspace="0" border="0" align="middle"> ! Szukanie zaawansowane, wi??cej opcji ! !
    !
      !        /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! ! ! Nowe nabytki !
    !
    ! nabyte w ci??gu ostatnich dni ! !
    !
      ! /images/front-arrow.gif" alt="" width="27" height="22" border="0"> ! ! !

    Zalogowano jako: [Twoje Konto][Wyloguj]

    ! !

    Zaloguj do Koha

    ! !
    ! ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:07:11 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:07:11 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-searchresults.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7831/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-searchresults.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-searchresults.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-searchresults.tmpl 22 Feb 2004 17:07:09 -0000 1.2.2.1 *************** *** 1,126 **** ! -
    - -

    Zalogowano jako: [Strony cz?onkowskie][Wyloguj si?]

    - -

    Zaloguj si? do Koha

    -     - - - - Szuka?e? - - Nie poda?e?/a? ?adnych kryteri?w wyszukiwania
    -     - - - znalezione trafienia -

    - - - - - &=>/images/numbers/prev.gif border=0> - - /images/numbers/placeholder.gif border=0> - - - - /images/numbers/-highlight.gif> - - &=>/images/numbers/.gif border=0> - - - - &=>/images/numbers/next.gif border=0> - - /images/numbers/placeholder.gif border=0> - - -

    - - - - - - - - - - /images/background-opac.gif> - - - - - - - /images/background-opac.gif> -
    Przedmiot
    >
    -  
    - - - - - - - /images/background-opac.gif> - - - - - - - - - - - - - - - - - - - - - /images/background-opac.gif> -
    Tytu?Autor©Ilo?? PozycjiLokalizacja 
    >> - >Zam?wienie - - Nierezerwowalne - -
    - - /images/background-opac.gif> -
    - - &=>Rekordy poprzednie - -   - - - - - - &=>Rekordy nast?pne - -   - -
    -
    -     - -
    - Trafienia od do z rekord?w. -

    - - - - Przepraszamy, nie znaleziono ?adnych trafie?
    - - Spr?buj kolejnej kwerendy - --- 1,132 ---- ! +
    + Szukano + + + nabyte w ci??gu ostatnich dni
    + + You did not specify any search criteria
    + + + + znalezionych pozycji
    +
    + + +
    + + &=">/images/numbers/prev.gif" border="0" alt="Previous Page" height="14" width="15"> + + /images/numbers/placeholder.gif" height="14" width="15" alt="" border="0"> + + + + /images/numbers/-highlight.gif" alt="" height="14" width="15" border="0"> + + &=">/images/numbers/.gif" border="0" alt="" height="14" width="15"> + + + + &=">/images/numbers/next.gif" border="0" height="14" width="15" alt="Next Page"> + + /images/numbers/placeholder.gif" border="0" width="14" height="14" alt=""> +
    +
    + + + + + + + + + + /images/background-opac.gif"> + + + + + + + + /images/background-opac.gif"> + + +
    Przedmiot
    ">
    +   +
    + + + + + + + /images/background-opac.gif"> + + + + + + + + + + + + + + + + + + + + + + + /images/background-opac.gif"> + + +
    Tytu??Autor©Liczba pozycjiLokalizacja 
    bgcolor="#ffffcc">">bgcolor="#ffffcc">">bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> bgcolor="#ffffcc"> + + ">Zam??w + + Not Reservable + +
    + + /images/background-opac.gif"> + + + +
    + + &=">Previous Records + +   + + + + &=">Next Records + +   + +
    +
    + + +
    +
    Rekordy od do z znalezionych.
    +
    + + + +
    Nic nie znaleziono
    + + +
    Spr??buj innej kwerendy
    + From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:06 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:06 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-detail.tmpl,1.4,1.4.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8060/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-detail.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** opac-detail.tmpl 26 Oct 2003 22:54:54 -0000 1.4 --- opac-detail.tmpl 22 Feb 2004 17:08:04 -0000 1.4.2.1 *************** *** 1,84 **** ! ! !

    Zalogowany jako: [Strony Cz?onkowskie][Wyloguj si?]

    ! !

    Zaloguj si? do Koha

    !     ! !

    >Zam?w

    !     ! ! ! () !

    ! ! !
    ! OPIS BIBLIO !
    ! ! Podtytu?: ! Autor: >
    ! Autor dodatkowy:
     ! Wydano przez : ! w ! , ! ,
    ! Collection:
    ! Has?o przedmiotowe:
    ! Rok :
    ! Uwagi:
    ! Unititle:
    ! Serial:
    ! Dewey:
    ! URL:
    ! ca?kowita liczba pozycji:
    ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Typ PozycjiKlasaLokalizacjaData zwrotuOstatnio ZdanoPasek Kreskowy
    Witryna OnlineDost?pna
    !

    !

    !
    !

    ! --- 1,75 ---- ! ! !

    ">Zam??w

    ! ! !

    !

    !

    ! !
    ! ( record )
    ! ! ISBN:">
    ! Subtitle:
    ! Autor: ">
    ! Additional Autor:
    ! Published by : ! in ! , ! ,
    ! Collection:
    ! Przedmiot:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number z Items:
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Typ pozycjiLokalizacjaDate DueLast SeenKod paskowy
    Website OnlineAvailable 
    !

    !


    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:21 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-auth.tmpl,1.5,1.5.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8113/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-auth.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-auth.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-auth.tmpl,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -r1.5 -r1.5.2.1 *** opac-auth.tmpl 3 Oct 2003 20:04:18 -0000 1.5 --- opac-auth.tmpl 22 Feb 2004 17:08:19 -0000 1.5.2.1 *************** *** 1,49 **** ! ! !

    Przepraszamy, system KOHA uwa?a, ?e nie masz uprawnie? do tej strony.

    ! ! !

    Przepraszamy, twoja sesja wygas?a, prosimy zalogowa? si? ponownie.

    ! ! !

    Tw?j dost?p dokonuje si? z innego adresu IP! Prosimy zalogowa? si? ponownie.

    ! ! !

    Wprowadzi?e? niepoprawne has?o lub nazw?, prosimy spr?bowa? ponownie.

    ! ! -
    !
    ! ! ! ! ! -
    ! ! ! ! ! !
    Koha - Wst?p
    NumerKarty:
    Has?o:
    -     		- - -
    ! --- 1,40 ---- ! ! !

    Sorry, KOHA doesnt think you have permission for this page.

    ! ! !

    Sorry, your session has timed out, please login again.

    ! ! !

    You are accessing koha from a different ip address! please login again.

    ! ! !

    Z?? has??o lub u??ytkownik/numer karty. Spr??buj raz jeszcze.

    ! ! !
    " method="post"> ! ! " value=""> ! ! ! ! ! !

    Wej??cie do Systemu

    Numer Karty:
    Has??o:
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:35 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-account.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8176/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-account.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-account.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-account.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-account.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- opac-account.tmpl 22 Feb 2004 17:08:32 -0000 1.2.2.1 *************** *** 1,39 **** ! ! ! Konto dla ! [ Pocz?tek][Wyloguj]

    ! !

    !

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    KARY I OP?ATYKWOTADO ZAP?ATY
    !
    W sumie
    !

     

    ! \ No newline at end of file --- 1,37 ---- ! ! !

    Rachunek dla

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-opac.gif" colspan="2">KARY & OP??ATY/images/background-opac.gif" colspan="1">KWOTA/images/background-opac.gif" colspan="1">POZOSTA??O
    !
    Do zap??aty
    !

     

    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:08:47 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:08:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl kohaerror.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8240/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 kohaerror.tmpl Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: kohaerror.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/kohaerror.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** kohaerror.tmpl 1 Oct 2003 12:46:58 -0000 1.2 --- kohaerror.tmpl 22 Feb 2004 17:08:44 -0000 1.2.2.1 *************** *** 1,17 **** ! ! !
    !
    ! ! !
    Wyst?pi? b??d
    -
    - ! --- 1,13 ---- ! !
    ! ! !
    An error has occurred
    ! From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:01 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:01 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes opac-top.inc,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8318/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 opac-top.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-top.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-top.inc,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-top.inc 1 Oct 2003 15:14:31 -0000 1.3 --- opac-top.inc 22 Feb 2004 17:08:59 -0000 1.3.2.1 *************** *** 1,70 **** ! ! ! KOHA: Przeszukiwanie katalogu OPAC ! ! ! - - - - - - - - - - - - - - - - - - - - - - - - - ! !
    KOHA: Przeszukiwanie KataloguSearch - - Zapisy - - Pocz?tek
    KOHA
    - -
    - --- 1,48 ---- ! ! KOHA: OPAC Catalogue Search ! ! /includes/opac.css"> ! ! + + + + + + + + +
    + /images/front-background-small.gif" height="50" border="0" alt="">KOHA + + + Search + + + + Join + + + Home + +   +
    + + + + +

    Zalogowano jako: [Twoje Konto][Wyloguj]

    + +

    Zaloguj to Koha

    + From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:22 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:22 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes opac-bottom.inc,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8403/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 opac-bottom.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: opac-bottom.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/opac-bottom.inc,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** opac-bottom.inc 1 Oct 2003 15:14:31 -0000 1.2 --- opac-bottom.inc 22 Feb 2004 17:09:19 -0000 1.2.2.1 *************** *** 1,32 ****
    - -

     

    -
    -
    ! ! ! ! Przeszukiwanie Katalogu || ! ! ! ! Pocz?tek ! ! -
    - - - --- 1,14 ----

     


    ! Catalogue Search || ! Home
    From kb2qzv at users.sourceforge.net Sun Feb 22 18:09:35 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 09:09:35 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/includes cat-class-list.inc,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8512/koha-tmpl/opac-tmpl/default/pl/includes Modified Files: Tag: rel_2_0 cat-class-list.inc Log Message: Translation by way of ./tmpl_process & text_extract2.pl script Index: cat-class-list.inc =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/includes/cat-class-list.inc,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** cat-class-list.inc 6 Jan 2003 02:06:06 -0000 1.1 --- cat-class-list.inc 22 Feb 2004 17:09:33 -0000 1.1.2.1 *************** *** 1,4 **** --- 1,4 ---- From acli at users.sourceforge.net Sun Feb 22 22:34:44 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 13:34:44 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplToken.pm,1.3,1.4 TmplTokenizer.pm,1.21,1.22 tmpl_process3.pl,1.4,1.5 xgettext.pl,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv471 Modified Files: TmplToken.pm TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Preliminary support for "analysis" of strings with tags. Early termination of analysis if we encounter some strings, such as

    or | or ||, in order to avoid extracting strings that are unnecessarily long and which doesn't add any meaningful context. Index: TmplToken.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplToken.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TmplToken.pm 19 Feb 2004 21:24:30 -0000 1.3 --- TmplToken.pm 22 Feb 2004 21:34:40 -0000 1.4 *************** *** 89,92 **** --- 89,98 ---- # only meaningful for TEXT_PARAMETRIZED tokens + sub anchors { + my $this = shift; + return map { $_->type == TmplTokenType::TAG && $_->string =~ /^{'_kids'}}; + } + + # only meaningful for TEXT_PARAMETRIZED tokens sub form { my $this = shift; Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** TmplTokenizer.pm 22 Feb 2004 09:04:53 -0000 1.21 --- TmplTokenizer.pm 22 Feb 2004 21:34:40 -0000 1.22 *************** *** 421,431 **** } ! sub _token_groupable_p ($) { # groupable into a TEXT_PARAMETRIZED token my($t) = @_; ! return $t->type == TmplTokenType::TEXT || ($t->type == TmplTokenType::DIRECTIVE && $t->string =~ /^(?:$re_tmpl_var)$/os) || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<\/?(?:b|em|h[123456]|i|u)\b/is || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) --- 421,442 ---- } ! sub _token_groupable1_p ($) { # as first token, groupable into TEXT_PARAMETRIZED my($t) = @_; ! return ($t->type == TmplTokenType::TEXT && $t->string !~ /^[,\.:\|\s]+$/s) || ($t->type == TmplTokenType::DIRECTIVE && $t->string =~ /^(?:$re_tmpl_var)$/os) || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<(?:b|em|h[123456]|i|u)\b/is ! || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) ! } ! ! sub _token_groupable2_p ($) { # as other token, groupable into TEXT_PARAMETRIZED ! my($t) = @_; ! return ($t->type == TmplTokenType::TEXT && ($t->string =~ /^\s*$/s || $t->string !~ /^[\|\s]+$/s)) ! || ($t->type == TmplTokenType::DIRECTIVE ! && $t->string =~ /^(?:$re_tmpl_var)$/os) ! || ($t->type == TmplTokenType::TAG ! && ($t->string =~ /^<\/?(?:a|b|em|h[123456]|i|u)\b/is || ($t->string =~ /^attributes->{'type'} =~ /^(?:text)$/i))) *************** *** 440,444 **** sub _formalize ($) { my($t) = @_; ! return $t->type == TmplTokenType::DIRECTIVE? '%s': _quote_cformat($t->string); } --- 451,458 ---- sub _formalize ($) { my($t) = @_; ! return $t->type == TmplTokenType::DIRECTIVE? '%s': ! $t->type == TmplTokenType::TAG? ! ($t->string =~ /^': _quote_cformat($t->string)): ! _quote_cformat($t->string); } *************** *** 453,456 **** --- 467,471 ---- } }; + &$undo_trailing_blanks; # FIXME: If the last token is a close tag but there are no tags # FIXME: before it, drop the close tag back into the queue. This *************** *** 515,558 **** if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? ! !blank_p( $it->string ): _token_groupable_p( $it ))) { my @structure = ( $it ); ! my($n_trailing_spaces, $next) = (0, undef); ! my($nonblank_text_p, $parametrized_p, $next) = (0, 0); if ($it->type == TmplTokenType::TEXT) { $nonblank_text_p = 1 if !blank_p( $it->string ); } elsif ($it->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; } ! for (my $i = 1, $n_trailing_spaces = 0;; $i += 1) { $next = $this->_next_token_intermediate($h); push @structure, $next; # for consistency (with initialization) ! last unless defined $next && _token_groupable_p( $next ); if ($next->type == TmplTokenType::TEXT) { ! if (blank_p( $next->string )) { ! $n_trailing_spaces += 1; ! } else { ! ($n_trailing_spaces, $nonblank_text_p) = (0, 1); ! } } elsif ($next->type == TmplTokenType::DIRECTIVE) { - $n_trailing_spaces = 0; $parametrized_p = 1; ! } else { ! $n_trailing_spaces = 0; } } # Undo the last token push @{$this->{_queue}}, pop @structure; ! # Undo trailing blank tokens ! for (my $i = 0; $i < $n_trailing_spaces; $i += 1) { ! push @{$this->{_queue}}, pop @structure; ! } @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do ; ! } elsif ($nonblank_text_p && $parametrized_p) { # Create the corresponding c-format string my $string = join('', map { $_->string } @structure); my $form = join('', map { _formalize $_ } @structure); $it = TmplToken->new($string, TmplTokenType::TEXT_PARAMETRIZED, $it->line_number, $it->pathname); $it->set_form( $form ); --- 530,583 ---- if (!$this->cdata_mode_p && $this->allow_cformat_p && defined $it && ($it->type == TmplTokenType::TEXT? ! !blank_p( $it->string ): _token_groupable1_p( $it ))) { my @structure = ( $it ); ! my @tags = (); ! my $next = undef; ! my($nonblank_text_p, $parametrized_p, $with_anchor_p) = (0, 0, 0); if ($it->type == TmplTokenType::TEXT) { $nonblank_text_p = 1 if !blank_p( $it->string ); } elsif ($it->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; + } elsif ($it->type == TmplTokenType::TAG && $it->string =~ /^<([A-Z0-9]+)/is) { + push @tags, lc($1); + $with_anchor_p = 1 if lc($1) eq 'a'; } ! # We hate | and || in msgid strings, so we try to avoid them ! for (my $i = 1, my $quit_p = 0, my $quit_next_p = ($it->type == TmplTokenType::TEXT && $it->string =~ /^\|+$/s);; $i += 1) { $next = $this->_next_token_intermediate($h); push @structure, $next; # for consistency (with initialization) ! last unless defined $next && _token_groupable2_p( $next ); ! last if $quit_next_p; if ($next->type == TmplTokenType::TEXT) { ! $nonblank_text_p = 1 if !blank_p( $next->string ); ! $quit_p = 1 if $next->string =~ /^\|+$/s; # We hate | and || } elsif ($next->type == TmplTokenType::DIRECTIVE) { $parametrized_p = 1; ! } elsif ($next->type == TmplTokenType::TAG) { ! if ($next->string =~ /^<([A-Z0-9]+)/is) { ! push @tags, lc($1); ! $with_anchor_p = 1 if lc($1) eq 'a'; ! } elsif ($next->string =~ /^<\/([A-Z0-9]+)/is) { ! my $close = lc($1); ! $quit_p = 1 unless @tags && $close eq $tags[$#tags]; ! $quit_next_p = 1 if $close =~ /^h\d$/; ! pop @tags; ! } } + last if $quit_p; } # Undo the last token push @{$this->{_queue}}, pop @structure; ! # Simply it a bit more @structure = $this->_optimize( @structure ); if (@structure < 2) { # Nothing to do ; ! } elsif ($nonblank_text_p && ($parametrized_p || $with_anchor_p)) { # Create the corresponding c-format string my $string = join('', map { $_->string } @structure); my $form = join('', map { _formalize $_ } @structure); + my $a_counter = 0; + $form =~ s// $a_counter += 1, "" /egs; $it = TmplToken->new($string, TmplTokenType::TEXT_PARAMETRIZED, $it->line_number, $it->pathname); $it->set_form( $form ); *************** *** 605,612 **** # Some functions that shouldn't be here... should be moved out some time ! sub parametrize ($@) { ! my($fmt, @params) = @_; my $it = ''; ! for (my $n = 0; length $fmt;) { if ($fmt =~ /^[^%]+/) { $fmt = $'; --- 630,637 ---- # Some functions that shouldn't be here... should be moved out some time ! sub parametrize ($$$) { ! my($fmt_0, $params, $anchors) = @_; my $it = ''; ! for (my $n = 0, my $fmt = $fmt_0; length $fmt;) { if ($fmt =~ /^[^%]+/) { $fmt = $'; *************** *** 620,624 **** $fmt = $'; if (!defined $width && !defined $prec) { ! $it .= $params[$i] } elsif (defined $width && defined $prec && !$width && !$prec) { ; --- 645,649 ---- $fmt = $'; if (!defined $width && !defined $prec) { ! $it .= $params->[$i] } elsif (defined $width && defined $prec && !$width && !$prec) { ; *************** *** 634,637 **** --- 659,678 ---- } } + for (my $n = 0, my $fmt = $it, $it = ''; length $fmt;) { + if ($fmt =~ /^(?:(?!).)+/is) { + $fmt = $'; + $it .= $&; + } elsif ($fmt =~ /^/is) { + $n += 1; + my $i = $1; + $fmt = $'; + my $anchor = $anchors->[$i - 1]; + warn_normal "$&: Anchor $1 not found for msgid \"$fmt_0\"", undef #FIXME + unless defined $anchor; + $it .= $anchor->string; + } else { + die "Completely confused decoding anchors: $fmt\n";#XXX + } + } return $it; } Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** tmpl_process3.pl 22 Feb 2004 08:18:27 -0000 1.4 --- tmpl_process3.pl 22 Feb 2004 21:34:40 -0000 1.5 *************** *** 89,96 **** } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); ! print $output TmplTokenizer::parametrize($fmt, map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? ! text_replace_tag($t, $attr): $t } $s->parameters); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); --- 89,96 ---- } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { my $fmt = find_translation($s->form); ! print $output TmplTokenizer::parametrize($fmt, [ map { my($kind, $t, $attr) = ($_->type, $_->string, $_->attributes); $kind == TmplTokenType::TAG && %$attr? ! text_replace_tag($t, $attr): $t } $s->parameters ], [ $s->anchors ]); } elsif ($kind eq TmplTokenType::TAG && %$attr) { print $output text_replace_tag($t, $attr); *************** *** 298,302 **** This is an experimental version of the tmpl_process.pl script, ! using standard gettext-style PO files. Currently, the create, update, and install actions have all been --- 298,303 ---- This is an experimental version of the tmpl_process.pl script, ! using standard gettext-style PO files. Note that the behaviour ! of this script should still be considered unstable. Currently, the create, update, and install actions have all been *************** *** 316,321 **** The --help option has not been implemented yet. ! There are probably some real bugs too, since this has not been ! tested very much. xgettext.pl must be present in the current directory; the --- 317,328 ---- The --help option has not been implemented yet. ! If an extracted string contain actual text (versus tags or ! TMPL_VAR directives), the strings are extracted verbatim, ! resulting in unwieldy things like multiple spaces, tabs, ! and/or newlines which are semantically indistinguishable ! from single blanks. If the template writer changes the ! spacing just a little bit, the new formatting would be ! considered new strings. This is arguably wrong, and in any ! case counter-productive. xgettext.pl must be present in the current directory; the *************** *** 332,335 **** --- 339,345 ---- (e.g., to get rid of the "Strange line" warning for #~). + There are probably some other bugs too, since this has not been + tested very much. + =head1 SEE ALSO Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** xgettext.pl 22 Feb 2004 06:46:17 -0000 1.3 --- xgettext.pl 22 Feb 2004 21:34:40 -0000 1.4 *************** *** 22,37 **** ############################################################################### ! sub negligible_p ($) { my($t) = @_; # a string # Don't emit pure whitespace, pure numbers, pure punctuation, # single letters, or TMPL_VAR's. # Punctuation should arguably be translated. But without context ! # they are untranslatable. return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\.,:;'"%\(\)\[\]\|]+$/ # pure punctuation w/o context || $t =~ /^[A-Za-z]$/ # single letters ! ); } --- 22,51 ---- ############################################################################### ! sub string_negligible_p ($) { my($t) = @_; # a string # Don't emit pure whitespace, pure numbers, pure punctuation, # single letters, or TMPL_VAR's. # Punctuation should arguably be translated. But without context ! # they are untranslatable. Note that $t is a string, not a token object. return !$extract_all_p && ( ! TmplTokenizer::blank_p($t) # blank or TMPL_VAR || $t =~ /^\d+$/ # purely digits ! || $t =~ /^[-\+\.,:;!\?'"%\(\)\[\]\|]+$/ # punctuation w/o context || $t =~ /^[A-Za-z]$/ # single letters ! ) ! } ! ! sub token_negligible_p( $ ) { ! my($x) = @_; ! my $t = $x->type; ! return !$extract_all_p && ( ! $t == TmplTokenType::TEXT? string_negligible_p( $x->string ): ! $t == TmplTokenType::DIRECTIVE? 1: ! $t == TmplTokenType::TEXT_PARAMETRIZED ! && join( '', map { my $t = $_->type; ! $t == TmplTokenType::DIRECTIVE? ! '1': $t == TmplTokenType::TAG? ! '': token_negligible_p( $_ )? ! '': '1' } @{$x->children} ) eq '' ); } *************** *** 40,45 **** sub remember ($$) { my($token, $string) = @_; ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; } --- 54,62 ---- sub remember ($$) { my($token, $string) = @_; ! # If we determine that the string is negligible, don't bother to remember ! unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; ! } } *************** *** 70,77 **** my($kind, $t, $attr) = ($s->type, $s->string, $s->attributes); if ($kind eq TmplTokenType::TEXT) { - #$t = TmplTokenizer::trim $t; remember( $s, $t ) if $t =~ /\S/s; } elsif ($kind eq TmplTokenType::TEXT_PARAMETRIZED) { - #$t = TmplTokenizer::trim $t; remember( $s, $s->form ) if $s->form =~ /\S/s; } elsif ($kind eq TmplTokenType::TAG && %$attr) { --- 87,92 ---- *************** *** 97,101 **** # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t unless negligible_p($t); } } --- 112,116 ---- # Emit all extracted strings. for my $t (string_list) { ! printf OUTPUT "%s\n", $t # unless negligible_p($t); } } *************** *** 128,132 **** my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { --- 143,147 ---- my $directory_re = quotemeta("$directory/"); for my $t (string_list) { ! #next if negligible_p($t); my $cformat_p; for my $token (@{$text{$t}}) { *************** *** 317,331 **** =back ! Right now it does about the same thing as text-extract2.pl but ! generates gettext-style output; however, because it is scanner- ! instead of parser-based, it is able to address the 4 weaknesses ! listed in translator_doc.txt. Ultimately, the goal is to make ! this able to do some kind of simple analysis on the input to ! produce gettext-style output with c-format strings, in order to ! facilitate translation to languages with a different word order ! than English. ! When the above is finished, the generated po file may contain ! some HTML tags in addition to %s strings. If you want to generate GNOME-style POTFILES.in files, such --- 332,340 ---- =back ! Note that this script is experimental and should still be ! considered unstable. ! Please refer to the explanation in tmpl_process3 for further ! details. If you want to generate GNOME-style POTFILES.in files, such From kb2qzv at users.sourceforge.net Sun Feb 22 23:01:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:01:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images/numbers - New directory Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images/numbers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7786/koha-tmpl/opac-tmpl/default/pl/images/numbers Log Message: Directory /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images/numbers added to the repository --> Using per-directory sticky tag `rel_2_0' From kb2qzv at users.sourceforge.net Sun Feb 22 23:38:51 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:38:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images background-mem.gif,NONE,1.1.2.1 background-opac.gif,NONE,1.1.2.1 clear-button.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15592/images Added Files: Tag: rel_2_0 background-mem.gif background-opac.gif clear-button.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a --- NEW FILE --- GIF89a? ?@1 d' ?z?????}??????????4?? Uxj ?t???Wd?dXv???gi???Xz ???4????~ J??????96????4?????????????????? 4hPK D?D@@x?Y ?Q?m????caRK-?@@? '??@'qB?@?U??? ??A? D?? @?#D??:I???u????4!&F?c??h???????L&??t?i???PN ?????*hd?? ?8?P???6????F*???Vj???B?%??"??????j????Zi+?n??,???m??j???Vs???a??i?+???k???&[l11%?h4?V???E?3?????????x]?? p9Yy ??:??ZB??h3? Z???"@ed??z?? a B From kb2qzv at users.sourceforge.net Sun Feb 22 23:39:29 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:39:29 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images front-arrow.gif,NONE,1.1.2.1 front-arrow-small.gif,NONE,1.1.2.1 front-background-med.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15728/images Added Files: Tag: rel_2_0 front-arrow.gif front-arrow-small.gif front-background-med.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a ??=l A?r???h????? ???&! --- NEW FILE --- GIF89a   QU1??.??.??X-XY.[*x|j4i<;2??M%LO*O@B=B33HJJO*{| #$2??-?? ,??$jm2?? (tv ]_h3h-??)(g3hn7nk7k"dfP$M&nq! %gj^.]Z2Z ^5^j5j ?A/??  --- NEW FILE --- GIF89a ??? s????????????$Rw i???????g wz?????????????S ??????? ?T?????????,?S ???????V?????????PV??????? V????????0?V ??????g?(??G?????D`!???#?0???3j$A??1C?Y.??)?6??\????E? I???h &?o ?? s???GK???? ?? ??5?L???j???@;,?Pq??KX?7m??QN2&?;??4 ?|d????U?}ZU?7????0?K?$?" ?`"??3??.m?cc???? ?LyYO????'?? ?G? ???+?d#?R????o\???U#??!UX`???4??obj?JY"5?l??[???? l?xU??0?h?^op?? ??,???????0?????`?zW??u|?m??t?X????? nb%H3N? ?jQ????@? ?D{-l1}???p?F???z?h! ????2J?|??g 96?i?T???`???w?Np?+????t??q'L? [????Crl`?G? qq$??x}??+?$????? ?|?,|$?T?????~??|28???????|}V????V????q???Ucz??6!dTg???l??|@tg?M8??,?{??$-????$x~?L??Li?8SY?hXH{7?-????; ????1?kKw:W???x????ryN ?S,}?? 1?????Z?=2?b?&V??H?j???????i???|??7?F4) ? ??u????`R~?x,?\?:<;?c???8?t??e;??G?X{L1 yE+??Z)U5?*e??a????1b5dU?5 ????V??:??&?U]??_?4Q??`???#??????y3G.?9$?D?u?????????*???%???|???/?M0???? ?] 0???(??%????1???Jr??Q?Spi??J????_Y H/????-|??N?? $k??g????0?@?b?Ms?????w+?t / ??S?Lw?x^?7]??? 8??(?B??@\b?:???1?G???#?5??R?"?`?Y1????X??3Lw% ~2??*?"Y?Wr?%X ?hU????Z?? ??G?&V???? ?)a=j??"6?VXlcy:??B5?z??*KT?S??T?^=?R/?P?????f??2?????"???B????bm]{[????-? ???4??$n%jV?u ?v~x?? ???b2?9kH6c??,=?r".t@?[?D?/MVp???O??<;??????io?o???_?????q????T?m??n????cX????50/?h\?L?% 5?]mb`o????&A??5?.???f????5,?x??4Yj????Z??????f?l????.w?W?n` @??fw??????????????|#? ???n????????????= G?? ``? ??? pc????????@ ?A&?Iz?BjA?@8?CJ?8??,???F???U 7j](~# ?d???B~B?^,??H?$L? ??Lc3)?N??-nd??@Z?2)?P??)?g??Q?b2?P>??3?O?$???ra????/P^Ov??@ `?!9b?TFw$?Z?#??[?e?<U????5?%?8? ???u??@ ??`bA??a"fZ?E2?%;B?[? $i?!?Y"#('cd?:(?Be|?|??e(?d?????"?Fp??He??&??????????g\J? ?T???a???? ???m?GrR;&?pg??x"i?d1?c??h$f?"?e?h=Z)ub ?W??:?? ?%S?!??d?"???"{??3N???]??? ??i??W?>&Y?)?i???? ????z>?????8 ?S??k ]?E?k?l(Wni??)?n??&?av????)??A?G``?????6%+??kH?MJ?$f?????9+??#?j?j? jy\lU$?x???2b[?$?gT?"/??l???bq??^P???h????T?x??o\?xT?9??*?????$???**??*??????Uh:l?&??hr????l???b?bb?#2??J?Y???8?m?mn?????1l????'?&?fX?????,p?G??????$?, @???C%.????????8?k?~GJnl?l??mg`?U?????i{???*jev?j?? ?*???^E-?p??y??????&D?f??.Dk?,d/ >F???t?R?????d??F????U????m? fm pe?_!p?0o0???F???y???nn? ??9b??m? ?+>???(????g ? ??/???? ?J? ????0?b0yhn?.g?~?H>dD?@ -?? ?C#? ???JA????N5????st??????F3f7?d!????Q?p????L4?u8`?J2kO?c0#H6e?aG ?e??m??,e? ??hfx9????o ?8? ?}????6$????_^?|?]G?O???p?2\?n?/?N??BiG???????x~?+;???b8?8??w??u??\?]???(#??@)""?s?% ^?}? z????\Oki?J??!???La Ix?G?]?P?????x??7??Z?^??^?????9 ??t??? ?$o?x??????~t?{??????|?????]?s|?K???h??v?p? 4????D? a?wy??X?8 T??M}?_???=? ????V?>???\????j??S????W??@'?|?S???~?#Y??J#{??????+??\ ??????=HbDF ?6 ???:??!j%0???8??Z`??H??WH???gP??f?j?&e?-?xew[?i? ^??e z"???e6?f??J?Jm????>?Iet?(???????m???y?Sh??~ j0?"Z% vf?eA?????:P????fv)?a,??????k????W $??&%?????*?t?????g????x????m??n???P9?:?5?jw ???w????&??k??rKo??z?Z2???^??:????I???????J(???> q?????^?"!Y?uy%w???B??R?@??*q?*??d???????;?o6?&??3?\r?.??r?B???0?0???t?L????'?Ht?V_??mU,,^SPr??S????;u?X??v?????(?-??p??v?z?]??~??w?? From kb2qzv at users.sourceforge.net Sun Feb 22 23:40:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:40:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images heading-login.gif,NONE,1.1.2.1 heading-member.gif,NONE,1.1.2.1 heading-search.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15862/images Added Files: Tag: rel_2_0 heading-login.gif heading-member.gif heading-search.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a& X?wp? H? A%? E??c?)?5?) ?d?>_,???@?A n?)w????h??]??P.?j?@?W9ee????? L?????+^???????? ????l?I???*k??1?Q?????#?????L@??L?g?vH???>? ?????? ????B?cQt?NF??c???a ??0?~??c?. at A?A???>?n+?.?????????Zm-?\??F??? ??????[??B?o??J?/?}&r????h??H?\??I????u???v??sS???jD??~r<?*?(?~8m???????x)???8?L?nD?g??:?? fx?+? ! ??6>s????WV??h???^?2??M`??k??C???Ns2m?????cB3???B&?? 6?8?? ;??? `?@??.p?Kc?????ajb????"p???tW??>3?Vm?Z? #??R???9?S?Z?Lv?+1?a?)?.?R[?t?c??(a??????? F??=WH?#}?bG????r?(??0?r4?????V???qCv4?H?F??A%X?????????J??j$??B??1?????R?6??M:+p|? ??>S?(?&>I?"??a?Rm???&???=0ns?[j$???a4??P???0?X'1lPi#?^??@??)P?!??3E?y????N???,??#? (h@??@h???@?vv??zp ??-9?YW??? Z ???????(Nl???????($ 7 "}????M Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15993/images Added Files: Tag: rel_2_0 holder.gif inside-koha-bottom.gif inside-top-join.gif inside-top-member.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a --- NEW FILE --- GIF89aE ??????$???8?-?? ?Z@ a???p????5h??k?? ??!?u{?EtV?O?@~?wA??)M?????aa!R?"ebhd?Q`????@K? ?' .??M????X?]V???2+ Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16122/images Added Files: Tag: rel_2_0 inside-top-search.gif koha.gif menu-home.gif menu-join.gif menu-login.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a]2 k??????L~*???"??svbh?6?F????? ?%m????K?+??????n????????+???6?P???d??,??om??@ ??B? ??^?Wl?r? ?e?? a????$?l??(?a??????p@?[7r@??\???gsJSF<? ?\6? 2?'??V?6.???q??0"Db}??^? ??????l`C?)]? ?}p?0L?B ???*???7?a?H?-z ?$ ??H?2??hC ~p? 9#?b???@'??-?'?\+b??-?F?E?&????*?,?k ?r? ???L?? 4 ????L8????U??~??}?s????t?S????????'\eej????Q%???? ?????3?4?P{?? ????@??q~pW50s-(  ???????@BuW4?a?U???6???*?? BT??NG --- NEW FILE --- GIF89a? pMVAy???TR?Y??1L'd?e??@??S|"?????@??$??:?Y?c??? ????????_?f? ?I ??Et?u?\@I ML?U?)?? ?=?s????H?? '?$?vUD?=??%??????v?????d??O??w?)????l??Dc??O?HS?`? ?'%?'=???HzU?kF8??????K2?IC???k?5???H???z????R??G#$?T??"mO?u ?8????%??'`b?x?i???????L0??6,&??[??f??y?????rg|B?0?$l^??qZ?R?Tr??r??h????P?jD??X?D??p?"q????G??B?H$???V,??8}??L?!???D??01?G0??N????UD?l?RE??61????D??Q?k]??+?L?E?????????L?h?d.1???TH?? ???E???? d"B???????A???T$?l!??D?-5?r?F0??^??\'?5r?????j?23?~??'?I?S<7?Qh????????\??rZG2-???K?N?\????? _????6?I?K?k? ?????}??&ka???^?K??+???4m??.???U8?@??;?o?JL^?8?^s_ ???C?&4? Q??K?????????'a,?F????&??'?? ?cw?>;?????+? !???H.Er????'?" 8?^??!??G?B?+T???\Mg????8?M!TCY "E?G.O,?^?S???!?$&f?+????;p?N???????U ?@V??9zA???*??f?????YJ??Q???p:?C?HI !??F? ?!Ty?J?)???S{I??p????W7?p???]?V? ??0?? APd??\?? ~.?q?!??YAC'G? &!?9px?DV?E?C|?f O?'WS?a??F???r??`? ?x??yb|??????4?q?OU&?%DO?Rl????7gQ?HNd?:u?%????FS?? Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16289/images Added Files: Tag: rel_2_0 menu-mysettings.gif menu-search.gif mouseover-home.gif mouseover-join.gif mouseover-member.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89aZ gg $nt"y+Z&??z? ???l"ns~q?\Z? ?? |\?p??aZwV)??#???b??#????axx]?ys?toU???)???n??,????????? ??L???:j4?2)?5y9YK?l????/?$?????? ??^?* ??g,??N =??+-E??D???????{$???q??!8r???a?T?O????o5???? ?;L????I?K? ?W????{8`8? ?M?~??r@^?*5?`?3?? ?3?#?JW?Ejtbm?b?LgZ????*??F??????@uD??????uHM?R??? ??C??"??Y??X??VCBU;HOL ?X?J??J?)?Z??????k?K???J?????H{M??W --- NEW FILE --- GIF89a,0 5u???-e? W B?.\>U^` d?$???????? ????????????? ?D? !? J?\?-??I?XQ??W? ??7" !?6???????g???7??G?0y?V1}U"?T?Y$?io?^U? ?oou}????x??]?TDx)?? ?? H ?c]???a??????u???Q????b?a???0b?b????1z?n ??L?2???f:?????4?I?jZ?????6???I?????8?I?r???>?S??????Z???-*r>??????CL?????I?_N??V??d???KMV79h??g?IU'2.i?#D????DU?&?"B3?9?p=F6?-?2+??X??9l3?????1??,F??(?#Yj3+Z?T?g/?D?V?v!r?1A?06?h#???Me??@?478?U?q?A??&n?E,??:???($???nut???(???Vt?????wc?x?v#C??????????^H?W9;(??j????????0???)?"Skj???@??@??7\7 ??I???Av6??????????0+xc?y???a ?F?? e?d???2#(?>???$?.@,&?#$??`?N^rT??&+?5':c?a???.G?????P? Sy???? ?? ?? ???J??L?O8 N???3!???Q?????Bx;?q??\?_??n6 ?C?W???\^????) zX??V?v31?>q???mrtu????T,}??????O?A??Hg :g?%???&??Q --- NEW FILE --- GIF89a,0 g 59?2??????.? ?BX\?EZdh"??A t?@?@/: ???G1p(?9????%?h_?=Y?;?????*?`el6????dkn ??F&?$i:? ????3?7 ?,D??????~??C?-? TW-???e?@A????i???????,?W???~nuX1?^??{???D???>+??O??? f??Zl?????? ~?/???z?0???Y?y????A~???OH?p?? ?HB? ?A9l?`uR?????x???I?B???L?"I?;?????$'II@ ?L0( 0&%?q??4P#A2?x???k??????:?7l%i?o???2h?K? U? From kb2qzv at users.sourceforge.net Sun Feb 22 23:42:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 22 Feb 2004 14:42:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl/images mouseover-search.gif,NONE,1.1.2.1 search-button.gif,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16393/images Added Files: Tag: rel_2_0 mouseover-search.gif search-button.gif Log Message: Images copied from en directory provided for usability of polish translation. --- NEW FILE --- GIF89a,0 XB^]_AV 9??4X0?????24X?? ??;?0 |???D?[#??H??)nH ????j??????z??0 ?`? 6) y??C_?+???k???&????6????F??_XhA?? ??*q?p?a??P?(xA??Q???`?-?h<J?5?d$h?i??c$WM??? ?Z? ?????/]??'? ??n?]d'A?M?????B(????_A?9mj??S?F7 =????=T]*??3??O~??*S?K??U??p?P?Z???(?????{??}?*;\+ ?J?fi???-! --- NEW FILE --- GIF89a? ? ??????$? ?"  ???4??XL?????? 9???? ??l-?p2'??? ????S?^??????c??WZ ??h????????? N?????i0biq??K?N?zu????@ ?De? $ ?$ F? ??ke??+?;f?c???}???E???JZ{??l??~????0c%?C?? y!??T?????0s? ?3?P?#P?*4(????"???? ?0f?????????????@?W?8??B??NE?`????H?OQ???C?)u??f~???5?j??? E???k$I From acli at users.sourceforge.net Mon Feb 23 02:21:06 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 17:21:06 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.22,1.23 tmpl_process3.pl,1.5,1.6 xgettext.pl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13082 Modified Files: TmplTokenizer.pm tmpl_process3.pl xgettext.pl Log Message: Fold all consecutive whitespaces into single blanks. This avoids problems when minor whitespace changes occur in the original templates; it also makes the strings much easier to read (e.g., instead of "foo\n\n\t\t bar", xgettext.pl will now always generate "foo bar" and tmpl_process3.pl will understand it to be the same as the original string). Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** TmplTokenizer.pm 22 Feb 2004 21:34:40 -0000 1.22 --- TmplTokenizer.pm 23 Feb 2004 01:21:03 -0000 1.23 *************** *** 449,455 **** --- 449,471 ---- } + sub string_canon ($) { + my($s) = @_; + if (1) { # FIXME + # Fold all whitespace into single blanks + $s =~ s/\s+/ /gs; + } + return $s; + } + + sub _formalize_string_cformat ($) { + my($s) = @_; + return _quote_cformat string_canon $s; + } + sub _formalize ($) { my($t) = @_; return $t->type == TmplTokenType::DIRECTIVE? '%s': + $t->type == TmplTokenType::TEXT? + _formalize_string_cformat($t->string): $t->type == TmplTokenType::TAG? ($t->string =~ /^': _quote_cformat($t->string)): *************** *** 599,602 **** --- 615,622 ---- } } + if (defined $it && $it->type == TmplTokenType::TEXT) { + my $form = string_canon $it->string; + $it->set_form( $form ); + } return $it; } Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** tmpl_process3.pl 22 Feb 2004 21:34:40 -0000 1.5 --- tmpl_process3.pl 23 Feb 2004 01:21:03 -0000 1.6 *************** *** 33,38 **** sub find_translation ($) { my($s) = @_; ! my $key = TmplTokenizer::quote_po($s) if $s =~ /\S/; ! $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); return defined $href->{$key} && !$href->{$key}->fuzzy --- 33,44 ---- sub find_translation ($) { my($s) = @_; ! my $key = $s; ! if ($s =~ /\S/s) { ! print STDERR "DEBUG: before: ($key)\n"; ! $key = TmplTokenizer::string_canon($key); ! $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); ! $key = TmplTokenizer::quote_po($key); ! print STDERR "DEBUG: after: ($key)\n"; ! } return defined $href->{$key} && !$href->{$key}->fuzzy *************** *** 313,329 **** file as c-format strings with %s. =head1 BUGS The --help option has not been implemented yet. - If an extracted string contain actual text (versus tags or - TMPL_VAR directives), the strings are extracted verbatim, - resulting in unwieldy things like multiple spaces, tabs, - and/or newlines which are semantically indistinguishable - from single blanks. If the template writer changes the - spacing just a little bit, the new formatting would be - considered new strings. This is arguably wrong, and in any - case counter-productive. - xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. --- 319,331 ---- file as c-format strings with %s. + Whitespace in extracted strings are folded to single blanks, in + order to prevent new strings from appearing when minor changes in + the original templates occur, and to prevent overly difficult to + read strings in the PO file. + =head1 BUGS The --help option has not been implemented yet. xgettext.pl must be present in the current directory; the msgmerge(1) command must also be present in the search path. Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** xgettext.pl 22 Feb 2004 21:34:40 -0000 1.4 --- xgettext.pl 23 Feb 2004 01:21:03 -0000 1.5 *************** *** 56,61 **** # If we determine that the string is negligible, don't bother to remember unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! $text{$string} = [] unless defined $text{$string}; ! push @{$text{$string}}, $token; } } --- 56,62 ---- # If we determine that the string is negligible, don't bother to remember unless (string_negligible_p( $string ) || token_negligible_p( $token )) { ! my $key = TmplTokenizer::string_canon( $string ); ! $text{$key} = [] unless defined $text{$key}; ! push @{$text{$key}}, $token; } } *************** *** 154,157 **** --- 155,159 ---- printf OUTPUT "#, c-format\n" if $cformat_p; printf OUTPUT "msgid %s\n", TmplTokenizer::quote_po + TmplTokenizer::string_canon TmplTokenizer::charset_convert $t, $charset_in, $charset_out; printf OUTPUT "msgstr %s\n\n", (defined $translation{$t}? From acli at users.sourceforge.net Mon Feb 23 04:13:38 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:13:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/marcimport marcimportdetail.tmpl,1.4,1.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31496 Modified Files: marcimportdetail.tmpl Log Message: "maxlenght" should be "maxlength" Index: marcimportdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** marcimportdetail.tmpl 11 Feb 2004 09:02:56 -0000 1.4 --- marcimportdetail.tmpl 23 Feb 2004 03:13:35 -0000 1.5 *************** *** 12,39 ****
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Title" size=40 maxlenght=255>
    Subtitle" size=40 maxlenght=255>
    Author" size=40 maxlenght=255>
    Additional authors
    Illustrator" size=40 maxlenght=255>
    Copyright" size=20 maxlenght=80>
    Series Title" size=40 maxlenght=255>
    Volume" size=40 maxlenght=255>
    Number" size=40 maxlenght=255>
    Volume Date" size=40 maxlenght=255>
    Volume Description" size=40 maxlenght=255>
    Subject" size=40 maxlenght=255>
    Notes" size=40 maxlenght=255>
    Item type
    ISBN" size=40 maxlenght=40>
    ISSN" size=40 maxlenght=40>
    LCCN" size=40 maxlenght=40>
    Dewey" size=8 maxlenght=10>
    Subclass" size=40 maxlenght=40>
    Publication Year" size=5 maxlenght=10>
    Publisher" size=40 maxlenght=255>
    Place" size=40 maxlenght=255>
    Pages" size=5 maxlenght=10>
    Size" size=40 maxlenght=40>
    --- 12,39 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Title" size=40 maxlength=255>
    Subtitle" size=40 maxlength=255>
    Author" size=40 maxlength=255>
    Additional authors
    Illustrator" size=40 maxlength=255>
    Copyright" size=20 maxlength=80>
    Series Title" size=40 maxlength=255>
    Volume" size=40 maxlength=255>
    Number" size=40 maxlength=255>
    Volume Date" size=40 maxlength=255>
    Volume Description" size=40 maxlength=255>
    Subject" size=40 maxlength=255>
    Notes" size=40 maxlength=255>
    Item type
    ISBN" size=40 maxlength=40>
    ISSN" size=40 maxlength=40>
    LCCN" size=40 maxlength=40>
    Dewey" size=8 maxlength=10>
    Subclass" size=40 maxlength=40>
    Publication Year" size=5 maxlength=10>
    Publisher" size=40 maxlength=255>
    Place" size=40 maxlength=255>
    Pages" size=5 maxlength=10>
    Size" size=40 maxlength=40>
    From acli at users.sourceforge.net Mon Feb 23 04:15:04 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:15:04 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.5,1.6 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31759 Modified Files: intranet.zh_TW Log Message: Interim update Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** intranet.zh_TW 22 Feb 2004 06:46:16 -0000 1.5 --- intranet.zh_TW 23 Feb 2004 03:15:01 -0000 1.6 *************** *** 4,8 **** # Copyright 2004 Ambrose Li # ! # FIXME words tentatively translated: active, illustration, illustrator, inactive # FIXME "request", "reserve" should be ?????? [http://www.tpml.edu.tw/chinese/service/service.htm] # --- 4,9 ---- # Copyright 2004 Ambrose Li # ! # FIXME words tentatively translated: active, illustration, illustrator, inactive, order, receive, seen ! # FIXME tentative: bookfund: ?????????????????? [...4274 lines suppressed...] msgid "traducteur" --- 6881,6884 ---- *************** *** 7096,7110 **** msgstr "z3950??????" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:16 - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:16 - msgid "" - "|| \n" - "Help" - msgstr "" - --- 6901,6902 ---- From acli at users.sourceforge.net Mon Feb 23 04:18:32 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 19:18:32 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/en opac-moredetail.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv619 Modified Files: opac-moredetail.tmpl Log Message: Comment syntax correction Index: opac-moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac-moredetail.tmpl 22 Dec 2003 09:14:21 -0000 1.8 --- opac-moredetail.tmpl 23 Feb 2004 03:18:29 -0000 1.9 *************** *** 14,18 **** > > ! --- 14,18 ---- > > !
    From acli at users.sourceforge.net Mon Feb 23 05:00:40 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:00:40 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator opac.zh_TW,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8691 Modified Files: opac.zh_TW Log Message: More interim updates Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** opac.zh_TW 20 Feb 2004 07:25:38 -0000 1.3 --- opac.zh_TW 23 Feb 2004 04:00:38 -0000 1.4 *************** *** 15,27 **** "Content-Transfer-Encoding: 8bit\n" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:10 - #, c-format - msgid "" - "%s\n" - "(%s)" - msgstr "" - "%s\n" - "(%s)" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:11 #, c-format --- 15,18 ---- *************** *** 47,51 **** #, c-format msgid "%s acquired in the last %s days" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:15 --- 38,42 ---- #, c-format msgid "%s acquired in the last %s days" ! msgstr "??????%2$s???????????????%1$s????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:15 *************** *** 57,61 **** #, c-format msgid "%s, %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 --- 48,52 ---- #, c-format msgid "%s, %s" ! msgstr "%s, %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:70 *************** *** 63,93 **** msgstr "©" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:27 - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:28 - msgid "," - msgstr "" - - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:89 - msgid "-" - msgstr "" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:20 #, c-format msgid "%s GROUP - %s " ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:56 #, c-format ! msgid "" ! "BARCODE\n" ! "%s" ! msgstr "" ! "??????\n" ! "%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 #, c-format ! msgid "%s ( record %s )" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:24 --- 54,81 ---- msgstr "©" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:20 #, c-format msgid "%s GROUP - %s " ! msgstr "%s ?????? - %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:56 #, c-format ! msgid "BARCODE %s" ! msgstr "?????? %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:15 #, c-format ! msgid "%s ( record %s )" ! msgstr "%s (?????????????????? %s)" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:83 ! #, c-format ! msgid " Accession Date:%s" ! msgstr "???????????????%s" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:87 ! #, c-format ! msgid "Total Issues: %s" ! msgstr "??????????????? %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:24 *************** *** 96,99 **** --- 84,92 ---- msgstr "???????????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:23 + #, c-format + msgid "Author: %s" + msgstr "?????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:91 #, c-format *************** *** 109,133 **** #, c-format msgid "Cancelled: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:36 #, c-format msgid "Classification: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:35 #, c-format msgid "Classification: %s%s%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:29 #, c-format msgid "Collection: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:77 #, c-format msgid "Current Branch: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:39 --- 102,126 ---- #, c-format msgid "Cancelled: %s" ! msgstr "????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:36 #, c-format msgid "Classification: %s" ! msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:35 #, c-format msgid "Classification: %s%s%s" ! msgstr "?????????%s%s%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:29 #, c-format msgid "Collection: %s" ! msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:77 #, c-format msgid "Current Branch: %s" ! msgstr "???????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:39 *************** *** 136,148 **** msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:90 #, c-format msgid "Group Number: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:71 #, c-format msgid "Home Branch: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:36 --- 129,147 ---- msgstr "?????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:35 + #, c-format + msgid "Dewey: %s" + msgstr "??????????????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:90 #, c-format msgid "Group Number: %s" ! msgstr "???????????????%s" + # XXX tentative #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:71 #, c-format msgid "Home Branch: %s" ! msgstr "???????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:36 *************** *** 151,154 **** --- 150,158 ---- msgstr "?????????????????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:21 + #, c-format + msgid "ISBN:%s" + msgstr "?????????????????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:42 #, c-format *************** *** 169,173 **** #, c-format msgid "LCCN: %s" ! msgstr "LCCN: %s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 --- 173,177 ---- #, c-format msgid "LCCN: %s" ! msgstr "LCCN???%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:75 *************** *** 189,198 **** #, c-format msgid "Last seen: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:33 #, c-format msgid "Loan Length: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:45 --- 193,202 ---- #, c-format msgid "Last seen: %s" ! msgstr "???????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:33 #, c-format msgid "Loan Length: %s" ! msgstr "???????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:45 *************** *** 221,240 **** #, c-format msgid "Place: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:25 ! #, fuzzy, c-format msgid "Published by :%s" ! msgstr "?????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:37 #, c-format msgid "Publisher: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:82 #, c-format msgid "Renewals: %s" ! msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:34 --- 225,244 ---- #, c-format msgid "Place: %s" ! msgstr "????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:25 ! #, c-format msgid "Published by :%s" ! msgstr "????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:37 #, c-format msgid "Publisher: %s" ! msgstr "????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:82 #, c-format msgid "Renewals: %s" ! msgstr "???????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:34 *************** *** 251,260 **** #, c-format msgid "Serial:%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:43 #, c-format msgid "Size: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:30 --- 255,264 ---- #, c-format msgid "Serial:%s" ! msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:43 #, c-format msgid "Size: %s" ! msgstr "?????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:30 *************** *** 278,281 **** --- 282,290 ---- msgstr "?????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:38 + #, c-format + msgid "URL: %s" + msgstr "?????????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:33 #, c-format *************** *** 286,290 **** #, c-format msgid "Volume: %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:31 --- 295,299 ---- #, c-format msgid "Volume: %s" ! msgstr "????????????%s" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:31 *************** *** 296,300 **** #, c-format msgid "You have a credit of %s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:28 --- 305,309 ---- #, c-format msgid "You have a credit of %s" ! msgstr "?????? %s ??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:28 *************** *** 310,313 **** --- 319,327 ---- msgstr "??????%s" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:9 + #, c-format + msgid "%s (%s)" + msgstr "%s (%s)" + #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:4 #, c-format *************** *** 323,331 **** msgstr "??????????????????" - # NOTE: see http://webpac.lib.ncku.edu.tw/Webpac2/store.dll/?ID=391066&T=2 - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:84 - msgid "Accession" - msgstr "??????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:90 msgid "Advanced Search, More Options" --- 337,340 ---- *************** *** 358,365 **** msgstr "??????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:23 - msgid "Author:" - msgstr "??????:" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:67 msgid "Available" --- 367,370 ---- *************** *** 394,398 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:41 msgid "Class" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:59 --- 399,403 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:41 msgid "Class" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:59 *************** *** 406,414 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:29 msgid "Copies" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 msgid "Current Loan" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:49 --- 411,420 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:29 msgid "Copies" ! msgstr "??????" + # FIXME variable name is "status", but... #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 msgid "Current Loan" ! msgstr "????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:49 *************** *** 416,424 **** msgstr "?????????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:85 - #, c-format - msgid "Date:%s" - msgstr "?????????%s" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:51 #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:66 --- 422,425 ---- *************** *** 431,438 **** msgstr "?????????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:35 - msgid "Dewey:" - msgstr "?????????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:95 msgid "Due date" --- 432,435 ---- *************** *** 441,449 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:5 msgid "Easy / Picture Books" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:6 msgid "Easy Reader" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:34 --- 438,446 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:5 msgid "Easy / Picture Books" ! msgstr "??????/?????????" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:6 msgid "Easy Reader" ! msgstr "????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:34 *************** *** 485,492 **** msgstr "????????????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:21 - msgid "ISBN:" - msgstr "?????????????????????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:36 msgid "Illustrator" --- 482,485 ---- *************** *** 495,499 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 msgid "Item Count" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:47 --- 488,492 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:71 msgid "Item Count" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:47 *************** *** 501,509 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:94 msgid "Item Type" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:96 msgid "Itemtype" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 494,502 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:94 msgid "Item Type" ! msgstr "??????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:96 msgid "Itemtype" ! msgstr "??????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 518,522 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:28 msgid "Join the library" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 511,515 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:28 msgid "Join the library" ! msgstr "????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 532,540 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:8 msgid "Junior Fiction" ! msgstr "????????????" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:7 msgid "Junior Non-Fiction" ! msgstr "???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:20 --- 525,533 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:8 msgid "Junior Fiction" ! msgstr "???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:7 msgid "Junior Non-Fiction" ! msgstr "??????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:20 *************** *** 548,552 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:8 msgid "Keywords" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:32 --- 541,545 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:8 msgid "Keywords" ! msgstr "?????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:32 *************** *** 556,560 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:50 msgid "Last Seen" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:10 --- 549,553 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:50 msgid "Last Seen" ! msgstr "????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:10 *************** *** 580,591 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 - msgid "Log Out" - msgstr "??????" - - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 - #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 #, c-format ! msgid "Logged in as: %s [" ! msgstr "???????????????%s [" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 --- 573,579 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 #, c-format ! msgid "Logged in as: %s [Members Home][Log Out]" ! msgstr "???????????????%s ??????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 *************** *** 599,607 **** msgstr "??????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 - #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 - msgid "Members Home" - msgstr "????????????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:55 #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:70 --- 587,590 ---- *************** *** 629,633 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:27 msgid "Normal" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:89 --- 612,616 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-search.tmpl:27 msgid "Normal" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:89 *************** *** 684,688 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:74 msgid "Pick Up Branch" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:107 --- 667,671 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:74 msgid "Pick Up Branch" ! msgstr "?????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:107 *************** *** 692,707 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:3 msgid "Please change what's needed. An email will be sent to the library." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:85 msgid "Please confirm that you wish to request an item of these types:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:44 #, c-format ! msgid "" ! "Please select the branch from which you want to collect the item:\n" ! "\t\t%s" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:20 --- 675,689 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:3 msgid "Please change what's needed. An email will be sent to the library." ! msgstr "??????????????????????????????????????????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:85 msgid "Please confirm that you wish to request an item of these types:" ! msgstr "???????????????????????????????????????????????????" + # XXX tentative #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:44 #, c-format ! msgid "Please select the branch from which you want to collect the item: %s" ! msgstr "?????????????????????????????????????????????%s???" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:20 *************** *** 710,713 **** --- 692,696 ---- "matches one of these types that becomes available will be set kept for you." msgstr "" + "?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:21 *************** *** 737,755 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:122 msgid "Reserve date" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:49 msgid "Reserve on this date:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:18 #, c-format msgid "Reserve page for item: %s (%s %s)" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/subject.tmpl:15 #, c-format msgid "Results %s through %s of %s records." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:122 --- 720,738 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:122 msgid "Reserve date" ! msgstr "????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:49 msgid "Reserve on this date:" ! msgstr "???????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:18 #, c-format msgid "Reserve page for item: %s (%s %s)" ! msgstr "???????????????%s (%s %s)???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/subject.tmpl:15 #, c-format msgid "Results %s through %s of %s records." ! msgstr "???%3$s??????????????????%1$s???%2$s?????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:122 *************** *** 778,782 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:16 msgid "Something new ?" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:4 --- 761,765 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:16 msgid "Something new ?" ! msgstr "????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-auth.tmpl:4 *************** *** 824,828 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:9 msgid "Teacher Reference" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:19 --- 807,811 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/cat-class-list.inc:9 msgid "Teacher Reference" ! msgstr "???????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:19 *************** *** 840,849 **** msgstr "??????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:88 - msgid "" - "Total\n" - "Issues:" - msgstr "??????????????????" - #: ../../koha-tmpl/opac-tmpl/default/en/opac-account.tmpl:27 msgid "Total Due" --- 823,826 ---- *************** *** 851,864 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! msgid "Try another" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:87 msgid "Type in the box and press the enter key." ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl:38 ! msgid "URL:" ! msgstr "?????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:17 --- 828,838 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! #, c-format ! msgid "Try another search" ! msgstr "??????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:87 msgid "Type in the box and press the enter key." ! msgstr "?????????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:17 *************** *** 868,872 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:57 msgid "View Accounts" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:5 --- 842,846 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:57 msgid "View Accounts" ! msgstr "????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:5 *************** *** 881,885 **** #, c-format msgid "Which is to be picked up from %s." ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:31 --- 855,859 ---- #, c-format msgid "Which is to be picked up from %s." ! msgstr "?????????????????????????????????%s???" #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:31 *************** *** 930,942 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:66 msgid "You have reserved items waiting:" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:13 msgid "You must select a branch for pickup!" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:12 msgid "You must select at least one item type!" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:6 --- 904,916 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:66 msgid "You have reserved items waiting:" ! msgstr "?????????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:13 msgid "You must select a branch for pickup!" ! msgstr "??????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-reserve.tmpl:12 msgid "You must select at least one item type!" ! msgstr "??????????????????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:6 *************** *** 951,965 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 msgid "Your changes won't appear until the library has validated them." ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 ! msgid "]" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:117 ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:44 ! msgid "][" ! msgstr "" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:105 --- 925,929 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-userupdate.tmpl:4 msgid "Your changes won't appear until the library has validated them." ! msgstr "????????????????????????????????????????????????????????????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:105 *************** *** 983,991 **** #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:74 msgid "on issue bit" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/opac-searchresults.tmpl:130 ! msgid "search" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 --- 947,951 ---- #: ../../koha-tmpl/opac-tmpl/default/en/opac-moredetail.tmpl:74 msgid "on issue bit" ! msgstr "??????" #: ../../koha-tmpl/opac-tmpl/default/en/opac-main.tmpl:4 *************** *** 996,1003 **** #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:46 msgid "to Koha" ! msgstr "" ! ! #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc:8 ! msgid "||" ! msgstr "" --- 956,959 ---- #: ../../koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc:46 msgid "to Koha" ! msgstr "Koha" From acli at users.sourceforge.net Mon Feb 23 05:02:09 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:02:09 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8860 Modified Files: tmpl_process3.pl Log Message: Oops, forgot to take out some debugging print statements Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** tmpl_process3.pl 23 Feb 2004 01:21:03 -0000 1.6 --- tmpl_process3.pl 23 Feb 2004 04:02:06 -0000 1.7 *************** *** 35,43 **** my $key = $s; if ($s =~ /\S/s) { - print STDERR "DEBUG: before: ($key)\n"; $key = TmplTokenizer::string_canon($key); $key = TmplTokenizer::charset_convert($key, $charset_in, $charset_out); $key = TmplTokenizer::quote_po($key); - print STDERR "DEBUG: after: ($key)\n"; } return defined $href->{$key} --- 35,41 ---- From acli at users.sourceforge.net Mon Feb 23 05:18:53 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Sun, 22 Feb 2004 20:18:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en intranet-main.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11946 Modified Files: intranet-main.tmpl Log Message: Missing charset declarations. Needed for translations generated by the translation tools. Index: intranet-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** intranet-main.tmpl 9 Dec 2003 10:28:57 -0000 1.11 --- intranet-main.tmpl 23 Feb 2004 04:18:51 -0000 1.12 *************** *** 3,6 **** --- 3,7 ---- WELCOME TO THE KOHA INTRANET +
    /images/background-mem.gif">
    ">//images/fileopen.png"> //images/edittrash.png"> ">Normal ')">?????? ?????????????????????
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    ????????????
    		class="button">??????
    --- NEW FILE ---

    ????????????

    ?????? ?????????
     
    ??????
    ??????????????????????????????????????????????????????
    ?????????
    ?????? Normal Exact
    ??????
    ??????
    ???????????????
    ??????
    ???
    ??????
    ????????????

    --- NEW FILE --- ????????????
    ???????????????????????????
    &startfrom=>????????? &startfrom=>?????????

    ??????????????????????????????
    --- NEW FILE --- ()

    ????????????

    ?????????
    ?????????
    ???????????????
    ???????????????
    ?????????
    ?????????
    ?????????
    ???????????????
    ?????????
    ?????????????????????

    ?????????????????? ?????? ????????? ????????? ????????????
    ?????? ?????? ?????? &bib=&bi=">http://


    --- NEW FILE ---
    >??????
    ()

    ????????????

    " class="button">????????????

    ?????????????????????">
    ?????????
    ?????????">
    ???????????????
    ???????????? ??????????????? , ,
    ?????????
    ?????????
    ????????????
    ?????????
    ???????????????
    ?????????
    ??????????????????">
    ?????????
    LCCN???
    ?????????">
    ?????????????????????

    ?????????????????? ????????? ????????? ???????????? ?????? Volume
    &item=&bib=&bi="> &item=>????????????????????????
    ?????? ?????? ?????? &bib=&bi=">http://


    ????????? ????????????
    ?????????
    ?????????
    ?????????">http://
    --> --- NEW FILE ---
    ????????????



    ???????????? ??????????????? , ,
    ?????????
    ?????????
    ????????????
    ?????????
    ???????????????
    ??????????????????">
    ?????????
    LCCN???
    ?????????">
    ISBN???
    ,
    --- NEW FILE ---


    >??????

    &type=intra> ()

    > >
    /images/background-mem.gif" > ?????? -
    //images/fileopen.png"> //images/edittrash.png">
    ?????????????????????
    ?????????????????????
    ?????????
    ???????????????
    ???????????????
    ?????????
    ISBN???
    ????????????
    ????????????
    ?????????
    ????????????
    ?????????
    ?????????
    ?????????
    ?????????
    ?????????
    /images/holder.gif" width=16 height=300 align=left>
    /images/background-mem.gif">??????
    > > > //images/fileopen.png"> //images/edittrash.png">
    ???????????????
    ???????????????
    ?????????????????????
    ??????????????????1???
    ??????????????????2???
    ???????????????
    ?????????
    ????????????????????????
    Paid for:
    ?????????
    ?????????
    &biblio=&invoice=&catview=yes">???????????????
    ????????????
    &bi=&itm=>????????????
    ???????????????
    ?????????????????????

    --- NEW FILE ---
    ?????????????????? ???????????????????????????
    ?????? ?????????

    &=&type=opacintra>/images/numbers/prev.gif border=0> /images/numbers/placeholder.gif border=0> /images/numbers/-highlight.gif> &=&type=opacintra>/images/numbers/.gif border=0> &=&type=opacintra>/images/numbers/next.gif border=0> /images/numbers/placeholder.gif border=0>

    bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    ????????????©???????????????  
    ?type=opacintra&bib=> &type=opacintra> >??????
    bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif">
    &=&type=opacintra">?????????   &=&type=opacintra">?????????  

    ??????????????????????????????

    ?????????????????????????????? ?????????????????????????????? --- NEW FILE ---
    ??????
    ">????????? ">?????????

    ??????????????????????????????
    From acli at users.sourceforge.net Tue Feb 24 06:12:53 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 21:12:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.7,1.8 aqbookfund.tmpl,1.4,1.5 aqbudget.tmpl,1.3,1.4 authorised_values.tmpl,1.2,1.3 branches.tmpl,1.8,1.9 categorie.tmpl,NONE,1.1 categoryitem.tmpl,NONE,1.1 charges.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,1.3,1.4 itemtypes.tmpl,1.4,1.5 koha2marclinks.tmpl,1.4,1.5 marc_subfields_structure.tmpl,1.5,1.6 marctagstructure.tmpl,1.5,1.6 printers.tmpl,1.2,1.3 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,1.6,1.7 thesaurus.tmpl,1.2,1.3 z3950servers.tmpl,NONE,1.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18933/intranet-tmpl/default/zh-TW/parameters Added Files: admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: New templates generated from opac.zh_TW and intranet.zh_TW --- NEW FILE ---

    ????????????

    ????????????

    name=Aform method=post>
    ???????????? >
    ????????????
    ??????  
    ???????????????
    ????????????
    ??????????????????
    ???????????????
    ??????????????????
    ????????????
    ???????????????
     
    ???????????????
    method=post>
    ????????????
    > ???????????????

    ????????????

    ????????? >
    ????????????
    ??????
    ???????????????
    ????????????
    ??????????????????
    ????????????
    ???????????????
    ?????????????????? ??????
    ????????????
    ???????????????
    This record is used times. Deletion not possible
    ??????????????????
    ?????? ?????? ??????????????? ??????????????? ???????????? ?????????????????? ?????? ?????? ???????????? ??????
    ??? ??? /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    --- NEW FILE ---

    ????????????

    ????????????

    name=Aform method=post>
    ???????????? >
    ????????????
    ?????? >  
    ??????????????? >
    ???????????? >
    ?????????????????? >
    ???????????? >
    Bulk >
    ??????????????? >
    ?????????????????? >
    ???????????? >
    ??????????????? >
     
    ??????????????? method=post>
    ????????????
    > ???????????????

    ????????????

    ????????? >
    ????????????
    ??????
    ???????????????
    ????????????
    ??????????????????
    ????????????
    Bulk
    ???????????????
    ??????????????????
    ????????????
    ???????????????
    This record is used times. Deletion not possible
    ??????????????????
    ?????? ?????? ?????? ???????????? ?????????????????? ?????? Bulk ?????? ?????? ???????????? ??????
    ?????? ??????


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    ?????? ??????
    ??????????????????
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    ?????? itemnum : the field itemnumber is mapped to a field in tab -1
    ???????????????????????? ???????????????????????????????????????
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    ?????? All item fields are in the same tag and in item tab
    itemtypes table ???????????? itemtypes table??????????????????????????????????????????
    ?????? itemtypes table ??????????????????
    itemtype NOT mapped biblioitems.itemtype????????????
  • be mapped to a MARC subfield,
  • ???????????????????????????????????????itemtype
    		•
    ?????? biblioitems.itemtype ?????????
    branch table ???????????? branch table?????????????????????????????????????????????
    ?????? branch table ??????????????????
    homebranch ???????????? items.homebranch?????????
  • be mapped to a MARC subfield,
  • ???????????????????????????????????????branches
    		•
    ?????? homebranch ?????????
    holdingbranch ???????????? items.holdingbranch????????????
  • be mapped to a MARC subfield,
  • ???????????????????????????????????????branches
    		•
    ?????? holdingbranch ?????????
    ??????????????????????????? biblio.biblionumber ??? biblioitems.biblioitemnumber ???????????????
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    ?????? biblionumber ??? biblioitemnumber ???????????????
    ?????? ?????????????????????????????????????????????Koha???????????????????????????
      Configuration OK, you don't have errors in your MARC parameters table
    --- NEW FILE ---

    ????????????

    ????????????

    ??????
    ??????
    ???????????????
    ??????
    ??????????????????
    ???????????????

    Stop word ??????

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    ?????????
    ??????
    ??????
    << ?????????        ????????? >>

    --- NEW FILE ---

    ??????Z39.50?????????

    ??????Z39.50?????????

    Z39.50?????????
    Z39.50?????????
    ????????????
    ???
    ?????????
    ?????????ID
    ??????
    ???????????? (????????????????????????)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    ???????????????
    >
    ??????
    ????????????
    ???
    ?????????
    ?????????ID
    ??????
    ????????????
    Rank
    ??????????????????
    ???????????????

    Z39.50???????????????

    >
    ?????????
    ?????? ???????????? ??? ????????? ?????????ID ?????? ???????????? Rank Syntax
    //images/fileopen.png" alt="??????" title="??????" border=0> //images/edittrash.png" alt="??????" title="??????" border=0>
    << ?????????        ????????? >>

    From acli at users.sourceforge.net Tue Feb 24 07:07:07 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 22:07:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue MARCdetail.tmpl,NONE,1.1.2.1 catalogue-home.tmpl,NONE,1.1.2.1 cmsdsearchresults.tmpl,NONE,1.1.2.1 detail-opac.tmpl,NONE,1.1.2.1 detail.tmpl,NONE,1.1.2.1 detailprint.tmpl,NONE,1.1.2.1 moredetail.tmpl,NONE,1.1.2.1 searchresults.tmpl,NONE,1.1.2.1 subject.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28329/intranet-tmpl/default/zh-TW/catalogue Added Files: Tag: rel_2_0 MARCdetail.tmpl catalogue-home.tmpl cmsdsearchresults.tmpl detail-opac.tmpl detail.tmpl detailprint.tmpl moredetail.tmpl searchresults.tmpl subject.tmpl Log Message: CVS seems to hate branches, or something Really Bad like that. I hope I have done the correct things to add these missing files back. --- NEW FILE ---
    /images/background-mem.gif">
    ">//images/fileopen.png"> //images/edittrash.png"> ">?????? ')">?????? ')">????????????????????? ?????????????????????
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    ????????????
    		class="button">??????
    --- NEW FILE ---

    ????????????

    ?????? ?????????
     
    ??????
    ??????????????????????????????????????????????????????
    ?????????
    ?????? ?????? Exact
    ??????
    ??????
    ???????????????
    ??????
    ???
    ??????
    ????????????

    --- NEW FILE --- ????????????
    ???????????????????????????
    &startfrom=>????????? &startfrom=>?????????

    ??????????????????????????????
    --- NEW FILE --- ()

    ????????????

    ?????????
    ?????????
    ???????????????
    ???????????????
    ?????????
    ?????????
    ?????????
    ???????????????
    ?????????
    ?????????????????????

    ?????????????????? ?????? ????????? ????????? ????????????
    ?????? ?????? ?????? &bib=&bi=">http://


    --- NEW FILE ---
    >??????
    ()

    ????????????

    " class="button">????????????

    ?????????????????????">
    ?????????
    ?????????">
    ???????????????
    ???????????? ??????????????? , ,
    ?????????
    ?????????
    ????????????
    ?????????
    ???????????????
    ?????????
    ??????????????????">
    ?????????
    LCCN???
    ?????????">
    ?????????????????????

    ?????????????????? ????????? ????????? ???????????? ?????? Volume
    &item=&bib=&bi="> &item=>????????????????????????
    ?????? ?????? ?????? &bib=&bi=">http://


    ????????? ????????????
    ?????????
    ?????????
    ?????????">http://
    --> --- NEW FILE ---
    ????????????



    ???????????? ??????????????? , ,
    ?????????
    ?????????
    ????????????
    ?????????
    ???????????????
    ??????????????????">
    ?????????
    LCCN???
    ?????????">
    ISBN???
    ,
    --- NEW FILE ---


    >??????

    &type=intra> ()

    > >
    /images/background-mem.gif" > ?????? -
    //images/fileopen.png"> //images/edittrash.png">
    ?????????????????????
    ?????????????????????
    ?????????
    ???????????????
    ???????????????
    ?????????
    ISBN???
    ????????????
    ????????????
    ?????????
    ????????????
    ?????????
    ?????????
    ?????????
    ?????????
    ?????????
    /images/holder.gif" width=16 height=300 align=left>
    /images/background-mem.gif">??????
    > > > //images/fileopen.png"> //images/edittrash.png">
    ???????????????
    ???????????????
    ?????????????????????
    ??????????????????1???
    ??????????????????2???
    ???????????????
    ?????????
    ????????????????????????
    Paid for:
    ?????????
    ?????????
    &biblio=&invoice=&catview=yes">???????????????
    ????????????
    &bi=&itm=>????????????
    ???????????????
    ?????????????????????

    --- NEW FILE ---
    ?????????????????? ???????????????????????????
    ?????? ?????????

    &=&type=opacintra>/images/numbers/prev.gif border=0> /images/numbers/placeholder.gif border=0> /images/numbers/-highlight.gif> &=&type=opacintra>/images/numbers/.gif border=0> &=&type=opacintra>/images/numbers/next.gif border=0> /images/numbers/placeholder.gif border=0>

    bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    ????????????©???????????????  
    ?type=opacintra&bib=> &type=opacintra> >?????? ????????????
    bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif">
    &=&type=opacintra>?????????   &=&type=opacintra>?????????  

    ??????????????????????????????

    ?????????????????????????????? ?????????????????????????????? --- NEW FILE ---
    ??????
    ">????????? ">?????????

    ??????????????????????????????
    From acli at users.sourceforge.net Tue Feb 24 07:07:13 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Mon, 23 Feb 2004 22:07:13 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters admin-home.tmpl,1.3.2.3,1.3.2.4 aqbookfund.tmpl,1.2.2.2,1.2.2.3 aqbudget.tmpl,1.2.2.1,1.2.2.2 authorised_values.tmpl,1.1.2.1,1.1.2.2 branches.tmpl,1.6.2.2,1.6.2.3 categorie.tmpl,NONE,1.1.2.1 categoryitem.tmpl,NONE,1.1.2.1 charges.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 currency.tmpl,1.1.2.3,1.1.2.4 itemtypes.tmpl,1.2.2.1,1.2.2.2 koha2marclinks.tmpl,1.3.2.1,1.3.2.2 marc_subfields_structure.tmpl,1.4.2.1,1.4.2.2 marctagstructure.tmpl,1.4.2.1,1.4.2.2 printers.tmpl,1.1.2.2,1.1.2.3 stopwords.tmpl,NONE,1.1.2.1 systempreferences.tmpl,1.3.2.3,1.3.2.4 thesaurus.tmpl,1.1.2.1,1.1.2.2 z3950servers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/zh-TW/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28329/intranet-tmpl/default/zh-TW/parameters Added Files: Tag: rel_2_0 admin-home.tmpl aqbookfund.tmpl aqbudget.tmpl authorised_values.tmpl branches.tmpl categorie.tmpl categoryitem.tmpl charges.tmpl checkmarc.tmpl currency.tmpl itemtypes.tmpl koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl printers.tmpl stopwords.tmpl systempreferences.tmpl thesaurus.tmpl z3950servers.tmpl Log Message: CVS seems to hate branches, or something Really Bad like that. I hope I have done the correct things to add these missing files back. --- NEW FILE ---

    ????????????

    ????????????

    name=Aform method=post>
    ???????????? >
    ????????????
    ??????  
    ???????????????
    ????????????
    ??????????????????
    ???????????????
    ??????????????????
    ????????????
    ???????????????
     
    ???????????????
    method=post>
    ????????????
    > ???????????????

    ????????????

    ????????? >
    ????????????
    ??????
    ???????????????
    ????????????
    ??????????????????
    ????????????
    ???????????????
    ?????????????????? ??????
    ????????????
    ???????????????
    ???????????????????????? ??????????????????
    ??????????????????
    ?????? ?????? ??????????????? ??????????????? ???????????? ?????????????????? ?????? ?????? ???????????? ??????
    ??? ??? /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    --- NEW FILE ---

    ????????????

    ????????????

    name=Aform method=post>
    ???????????? >
    ????????????
    ?????? >  
    ??????????????? >
    ???????????? >
    ?????????????????? >
    ???????????? >
    Bulk >
    ??????????????? >
    ?????????????????? >
    ???????????? >
    ??????????????? >
     
    ??????????????? method=post>
    ????????????
    > ???????????????

    ????????????

    ????????? >
    ????????????
    ??????
    ???????????????
    ????????????
    ??????????????????
    ????????????
    Bulk
    ???????????????
    ??????????????????
    ????????????
    ???????????????
    ???????????????????????? ??????????????????
    ??????????????????
    ?????? ?????? ?????? ???????????? ?????????????????? ?????? Bulk ?????? ?????? ???????????? ??????
    ?????? ??????


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    ?????? ??????
    ??????????????????
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    ?????? itemnum : the field itemnumber is mapped to a field in tab -1
    ???????????????????????? ???????????????????????????????????????
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    ?????? All item fields are in the same tag and in item tab
    itemtypes table ???????????? itemtypes table??????????????????????????????????????????
    ?????? itemtypes table ??????????????????
    itemtype NOT mapped biblioitems.itemtype????????????
  • be mapped to a MARC subfield,
  • ???????????????????????????????????????itemtype
    		•
    ?????? biblioitems.itemtype ?????????
    branch table ???????????? branch table?????????????????????????????????????????????
    ?????? branch table ??????????????????
    homebranch ???????????? items.homebranch?????????
  • be mapped to a MARC subfield,
  • ???????????????????????????????????????branches
    		•
    ?????? homebranch ?????????
    holdingbranch ???????????? items.holdingbranch????????????
  • be mapped to a MARC subfield,
  • ???????????????????????????????????????branches
    		•
    ?????? holdingbranch ?????????
    ??????????????????????????? biblio.biblionumber ??? biblioitems.biblioitemnumber ???????????????
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    ?????? biblionumber ??? biblioitemnumber ???????????????
    ?????? ?????????????????????????????????????????????Koha???????????????????????????
      Configuration OK, you don't have errors in your MARC parameters table
    --- NEW FILE ---

    ????????????

    ????????????

    ??????
    ??????
    ???????????????
    ??????
    ??????????????????
    ???????????????

    Stop word ??????

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    ?????????
    ??????
    ??????
    << ?????????        ????????? >>

    --- NEW FILE ---

    ??????Z39.50?????????

    ??????Z39.50?????????

    Z39.50?????????
    Z39.50?????????
    ????????????
    ???
    ?????????
    ?????????ID
    ??????
    ???????????? (????????????????????????)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    ???????????????
    >
    ??????
    ????????????
    ???
    ?????????
    ?????????ID
    ??????
    ????????????
    Rank
    ??????????????????
    ???????????????

    Z39.50???????????????

    >
    ?????????
    ?????? ???????????? ??? ????????? ?????????ID ?????? ???????????? Rank Syntax
    //images/fileopen.png" alt="??????" title="??????" border=0> //images/edittrash.png" alt="??????" title="??????" border=0>
    << ?????????        ????????? >>

    From acli at users.sourceforge.net Tue Feb 24 15:20:49 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 06:20:49 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.12,1.13 xgettext.pl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23699 Modified Files: tmpl_process3.pl xgettext.pl Log Message: tmpl_process3.pl did not know how to handle absolute pathnames in -i. (Actually, xgettext.pl did not know how to handle them in the files listed in the list of files.) If the po file is empty (corrupted), $href->{'""'} will be undefined. We just blindly dereferenced this null value without checking. Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** tmpl_process3.pl 24 Feb 2004 00:47:53 -0000 1.12 --- tmpl_process3.pl 24 Feb 2004 14:20:46 -0000 1.13 *************** *** 222,225 **** --- 222,227 ---- # guess the charsets. HTML::Templates defaults to iso-8859-1 if (defined $href) { + die "$str_file: PO file is corrupted, or not a PO file\n" + unless defined $href->{'""'}; $charset_out = TmplTokenizer::charset_canon $2 if $href->{'""'}->msgstr =~ /\bcharset=(["']?)([^;\s"'\\]+)\1/; *************** *** 242,246 **** if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added ! die "$str_file: Output file already exists" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); # Generate the temporary file that acts as /POTFILES.in --- 244,252 ---- if ($action eq 'create') { # updates the list. As the list is empty, every entry will be added ! if (!-s $str_file) { ! warn "Removing empty file $str_file\n"; ! unlink $str_file || die "$str_file: $!\n"; ! } ! die "$str_file: Output file already exists\n" if -f $str_file; my($tmph, $tmpfile) = tmpnam(); # Generate the temporary file that acts as /POTFILES.in Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** xgettext.pl 24 Feb 2004 00:48:18 -0000 1.8 --- xgettext.pl 24 Feb 2004 14:20:46 -0000 1.9 *************** *** 292,299 **** while () { chomp; ! my $h = TmplTokenizer->new( "$directory/$_" ); $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name "$directory/$_"; ! print STDERR "$0: Processing file \"$directory/$_\"\n" if $verbose_p; text_extract( $h ); } --- 292,300 ---- while () { chomp; ! my $input = /^\//? $_: "$directory/$_"; ! my $h = TmplTokenizer->new( $input ); $h->set_allow_cformat( 1 ); ! VerboseWarnings::set_input_file_name $input; ! print STDERR "$0: Processing file \"$input\"\n" if $verbose_p; text_extract( $h ); } From oleonard at users.sourceforge.net Tue Feb 24 17:17:24 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:17:24 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.18.2.1,1.18.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18004/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: Tag: rel_2_0 branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Also quoted all attributes in HTML. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -C2 -r1.18.2.1 -r1.18.2.2 *** branches.tmpl 6 Feb 2004 14:12:27 -0000 1.18.2.1 --- branches.tmpl 24 Feb 2004 16:17:22 -0000 1.18.2.2 *************** *** 1,18 **** ! !


    !
    ! --- 1,18 ---- ! !


    ! " name="Aform" method="post"> !
    Branch code ! ! ! !
    *************** *** 20,31 **** ! ! ! ! --- 20,31 ---- ! ! ! ! *************** *** 34,62 **** ! ! ! ! ! ! !
    Branch code ! ! "> ! ! ">
    Name"> 
    >
    Name"> 
    " >
    Address
     
     
    Phone
    Fax
    E-mail
     
    --- 34,62 ----
    Address">
     ">
     ">
    Phone">
    Fax">
    E-mail">
     
    *************** *** 64,138 **** ! Confirm delete: ! ! ! > !

    ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 64,138 ---- ! Confirm delete: ! " method="post"> ! ! > ! " method="post"> ! !


    ! !
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    ! ! !
    		!
    ! !
    ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! *************** *** 141,179 ****
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    " method="post"> ! ! "> !
    		!
    " method="post"> ! "> !

    !
    method=post> ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 141,179 ----
    ! Branches Categories
    NameCodeDescription    
    !
    ! !
    		!
    ! !

    !
    method="post"> ! !

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! *************** *** 182,204 ****
    ! Branches Categories
    NameCodeDescription    
    !
    " method="post"> ! ! ">
    		!
    " method="post"> ! "> !

    !
    method=post> ! !
    ! !


    !
    ! --- 182,204 ----
    Category code ! ! ! !

    ! method="post"> ! !
    ! !


    !
    " name="Aform" method="post"> ! *************** *** 206,217 **** ! ! !
    Category code ! ! "> ! ! ">
    Name"> 
    Description"> 
    --- 206,217 ----
    Name"> 
    Description"> 
    *************** *** 219,230 **** ! Confirm delete: ! ! ! !
    --- 219,230 ---- ! Confirm delete: !
    " method="post"> ! ! ">
    !
    " method="post">
    From oleonard at users.sourceforge.net Tue Feb 24 17:40:14 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:40:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.19,1.20 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23510/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Also quoted all attributes in HTML. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** branches.tmpl 11 Feb 2004 09:02:55 -0000 1.19 --- branches.tmpl 24 Feb 2004 16:40:11 -0000 1.20 *************** *** 1,18 **** ! !


    !
    ! --- 1,18 ---- ! !


    ! " name="Aform" method="post"> !
    Branch code ! ! ! !
    *************** *** 20,31 **** ! ! ! ! --- 20,31 ---- ! ! ! ! *************** *** 34,62 **** ! ! ! ! ! ! !
    Branch code ! ! "> ! ! ">
    Name"> 
    >
    Name"> 
    " >
    Address
     
     
    Phone
    Fax
    E-mail
     
    --- 34,62 ---- Address ! ">   ! ">   ! "> Phone ! "> Fax ! "> E-mail ! ">   ! *************** *** 64,138 **** ! Confirm delete: ! ! ! >
    !
    ! !


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 64,138 ---- ! Confirm delete: ! " method="post"> ! ! > ! " method="post"> ! !


    ! !
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    ! ! !
    		!
    ! !
    ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! *************** *** 141,179 ****
    ! Branches
    NameCodeAddressCategories  
    ! (nothing entered) ! ! ! !
    ! !
    ! !
    Ph: ! !
    Fax: ! !
    Email:     		! (no categories set) ! !
    		!
    " method="post"> ! ! "> !
    		!
    " method="post"> ! "> !

    !
    method=post> ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! --- 141,179 ----
    ! Branches Categories
    NameCodeDescription    
    !
    ! !
    		!
    ! !

    !
    method="post"> ! !

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! *************** *** 182,204 ****
    ! Branches Categories
    NameCodeDescription    
    !
    " method="post"> ! ! ">
    		!
    " method="post"> ! "> !

    !
    method=post> ! !
    ! !


    !
    ! --- 182,204 ----
    Category code ! ! ! !

    ! method="post"> ! !
    ! !


    !
    " name="Aform" method="post"> ! *************** *** 206,217 **** ! ! !
    Category code ! ! "> ! ! ">
    Name"> 
    Description"> 
    --- 206,217 ---- Name ! ">  Description ! ">  ! *************** *** 219,230 **** ! Confirm delete: ! ! !
    !
    --- 219,230 ---- ! Confirm delete: !
    " method="post"> ! ! ">
    !
    " method="post">
    From oleonard at users.sourceforge.net Tue Feb 24 17:41:25 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Tue, 24 Feb 2004 08:41:25 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters branches.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23736/koha-tmpl/intranet-tmpl/npl/en/parameters Modified Files: branches.tmpl Log Message: Changing branchcode input field to maxlength=4 to reflect size limit of MySQL field. Index: branches.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/branches.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** branches.tmpl 19 Feb 2004 19:14:35 -0000 1.1 --- branches.tmpl 24 Feb 2004 16:41:14 -0000 1.2 *************** *** 16,20 **** ! " /> --- 16,20 ---- ! " /> From acli at users.sourceforge.net Wed Feb 25 04:37:29 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 19:37:29 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator VerboseWarnings.pm,1.3,1.4 tmpl_process3.pl,1.13,1.14 xgettext.pl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9253 Modified Files: VerboseWarnings.pm tmpl_process3.pl xgettext.pl Log Message: Benedict wants some message at the end that says success or failure. It's a good idea too. Index: VerboseWarnings.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/VerboseWarnings.pm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** VerboseWarnings.pm 23 Feb 2004 19:56:47 -0000 1.3 --- VerboseWarnings.pm 25 Feb 2004 03:37:27 -0000 1.4 *************** *** 26,37 **** --- 26,44 ---- @EXPORT_OK = qw( &pedantic_p + &warn_additional &warn_normal &warn_pedantic + &error_additional &error_normal ); + %EXPORT_TAGS = ( + 'warn' => [ 'warn_additional', 'warn_normal', 'warn_pedantic' ], + 'die' => [ 'error_additional', 'error_normal' ], + ); ############################################################################### use vars qw( $appName $input $input_abbr $pedantic_p $pedantic_tag ); + use vars qw( $warned $erred ); sub set_application_name ($) { *************** *** 40,43 **** --- 47,54 ---- } + sub application_name () { + return $appName; + } + sub set_input_file_name ($) { my($s) = @_; *************** *** 71,75 **** } ! sub warn_normal ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('Warning', $lc); --- 82,86 ---- } ! sub warn_additional ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('Warning', $lc); *************** *** 78,81 **** --- 89,98 ---- } + sub warn_normal ($$) { + my($msg, $lc) = @_; + $warned += 1; + warn_additional($msg, $lc); + } + sub warn_pedantic ($$$) { my($msg, $lc, $flag) = @_; *************** *** 88,94 **** $$flag = 1; } } ! sub error_normal ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('ERROR', $lc); --- 105,112 ---- $$flag = 1; } + $warned += 1; } ! sub error_additional ($$) { my($msg, $lc) = @_; my $prefix = construct_warn_prefix('ERROR', $lc); *************** *** 97,99 **** --- 115,127 ---- } + sub error_normal ($$) { + my($msg, $lc) = @_; + $erred += 1; + error_additional($msg, $lc); + } + + sub warned () { + return $warned; # number of times warned + } + ############################################################################### Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** tmpl_process3.pl 24 Feb 2004 14:20:46 -0000 1.13 --- tmpl_process3.pl 25 Feb 2004 03:37:27 -0000 1.14 *************** *** 17,21 **** use File::Temp qw( :POSIX ); use TmplTokenizer; ! use VerboseWarnings qw( error_normal warn_normal ); ############################################################################### --- 17,21 ---- use File::Temp qw( :POSIX ); use TmplTokenizer; ! use VerboseWarnings qw( :warn :die ); ############################################################################### *************** *** 150,153 **** --- 150,154 ---- The -o option is ignored for the "create" and "update" actions. + Try `perldoc $0' for perhaps more information. EOF exit($exitcode); *************** *** 155,158 **** --- 156,160 ---- ############################################################################### + sub usage_error (;$) { for my $msg (split(/\n/, $_[0])) { *************** *** 241,244 **** --- 243,247 ---- my $xgettext = './xgettext.pl'; # actual text extractor script + my $st; if ($action eq 'create') { *************** *** 256,262 **** close $tmph; # Generate the specified po file ($str_file) ! my $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file); warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0; ! unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { --- 259,265 ---- close $tmph; # Generate the specified po file ($str_file) ! $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file); warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0; ! # unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef; } elsif ($action eq 'update') { *************** *** 270,274 **** close $tmph1; # Generate the temporary file that acts as /.pot ! my $st = system($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2, '--po-mode', (defined $charset_in? ('-I', $charset_in): ()), --- 273,277 ---- close $tmph1; # Generate the temporary file that acts as /.pot ! $st = system($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2, '--po-mode', (defined $charset_in? ('-I', $charset_in): ()), *************** *** 278,288 **** # FIXME: msgmerge(1) is a Unix dependency # FIXME: need to check the return value ! system('msgmerge', '-U', '-s', $str_file, $tmpfile2); } else { ! warn_normal "Text extraction failed: $xgettext: $!\n", undef; ! warn_normal "Will not run msgmerge\n", undef; } ! unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; ! unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { --- 281,291 ---- # FIXME: msgmerge(1) is a Unix dependency # FIXME: need to check the return value ! $st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2); } else { ! error_normal "Text extraction failed: $xgettext: $!\n", undef; ! error_additional "Will not run msgmerge\n", undef; } ! # unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef; ! # unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef; } elsif ($action eq 'install') { *************** *** 329,332 **** --- 332,342 ---- usage_error('Unknown action specified.'); } + + if ($st == 0) { + printf "The %s seems to be successful, with %d warning(s).\n", + $action, VerboseWarnings::warned; + } else { + printf "%s FAILED.\n", "\u$action"; + } exit 0; Index: xgettext.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** xgettext.pl 24 Feb 2004 14:20:46 -0000 1.9 --- xgettext.pl 25 Feb 2004 03:37:27 -0000 1.10 *************** *** 237,240 **** --- 237,242 ---- Informative output: --help Display this help and exit + + Try `perldoc $0' for perhaps more information. EOF exit($exitcode); From acli at users.sourceforge.net Wed Feb 25 04:40:03 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 19:40:03 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.14,1.15 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9623 Modified Files: tmpl_process3.pl Log Message: Bug in previous checkin, because we can't get the number of warnings from the child. Index: tmpl_process3.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** tmpl_process3.pl 25 Feb 2004 03:37:27 -0000 1.14 --- tmpl_process3.pl 25 Feb 2004 03:39:49 -0000 1.15 *************** *** 334,339 **** if ($st == 0) { ! printf "The %s seems to be successful, with %d warning(s).\n", ! $action, VerboseWarnings::warned; } else { printf "%s FAILED.\n", "\u$action"; --- 334,338 ---- if ($st == 0) { ! printf "The %s seems to be successful.\n", $action; } else { printf "%s FAILED.\n", "\u$action"; From acli at users.sourceforge.net Wed Feb 25 07:08:46 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:08:46 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.25,1.26 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1842 Modified Files: TmplTokenizer.pm Log Message: This should make it handle commenting out of whole blocks of HTML better. It seems to be still correct, and it is no longer complaining about syntax errors when seeing commented-out HTML (esp. with TMPL_* directives). Don't try to translate stuff between ... too, the stuff in the middle is supposed to be PCDATA. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** TmplTokenizer.pm 23 Feb 2004 18:49:56 -0000 1.25 --- TmplTokenizer.pm 25 Feb 2004 06:08:41 -0000 1.26 *************** *** 34,37 **** --- 34,38 ---- use vars qw( $pedantic_attribute_error_in_nonpedantic_mode_p ); use vars qw( $pedantic_tmpl_var_use_in_nonpedantic_mode_p ); + use vars qw( $pedantic_error_markup_in_pcdata_p ); ############################################################################### *************** *** 63,67 **** # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:[^-]|-[^-])*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; --- 64,68 ---- # This is no longer similar to the original regexp in subst.pl :-( # Note that we don't want <> in compat mode; Mozilla knows about < ! q{(<\/?(?:|(?:"(?:} . $re_directive . q{|[^"])*"|'(?:} . $re_directive . q{|[^'])*'|--(?:(?!--)(?:$re_directive)*.)*--|(?:} . $re_directive . q{|(?!--)[^"'<>} . $etag . q{]))+))([} . $etag . q{]|(?=<))(.*)}; *************** *** 92,95 **** --- 93,97 ---- sub CDATA_MODE_P () {'cdata-mode-p'} sub CDATA_CLOSE () {'cdata-close'} + sub PCDATA_MODE_P () {'pcdata-mode-p'} # additional submode for CDATA sub ALLOW_CFORMAT_P () {'allow-cformat-p'} *************** *** 163,166 **** --- 165,173 ---- } + sub pcdata_mode_p { + my $this = shift; + return $this->{+PCDATA_MODE_P}; + } + sub cdata_close { my $this = shift; *************** *** 228,231 **** --- 235,244 ---- } + sub _set_pcdata_mode { + my $this = shift; + $this->{+PCDATA_MODE_P} = $_[0]; + return $this; + } + sub _set_cdata_close { my $this = shift; *************** *** 321,324 **** --- 334,338 ---- } else { # tag/declaration/processing instruction my $ok_p = 0; + my $bad_comment_p = 0; for (my $cdata_close = $this->cdata_close;;) { if ($this->cdata_mode_p) { *************** *** 350,359 **** warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; } ! } elsif ($this->_peek_readahead =~ /^).)*-->/s) { ($kind, $it) = (TmplTokenType::COMMENT, $&); $this->_set_readahead( $' ); $ok_p = 1; ! warn_normal "Syntax error in comment: $&\n", $this->line_number_start; ! $this->_set_syntaxerror( 1 ); } last if $ok_p; --- 364,372 ---- warn_normal "SGML \"closed start tag\" notation: $head<\n", $this->line_number if $tail eq ''; } ! } elsif ($this->_peek_readahead =~ /^)$re_directive*.)*-->/os) { ($kind, $it) = (TmplTokenType::COMMENT, $&); $this->_set_readahead( $' ); $ok_p = 1; ! $bad_comment_p = 1; } last if $ok_p; *************** *** 377,380 **** --- 390,397 ---- if ($it =~ /^$re_directive/ios && !$this->cdata_mode_p) { $kind = TmplTokenType::DIRECTIVE; + } elsif ($bad_comment_p) { + warn_normal sprintf("Syntax error in comment: %s\n", $it), + $this->line_number_start; + $this->_set_syntaxerror( 1 ); } if (!$ok_p && $eof_p) { *************** *** 401,404 **** --- 418,426 ---- $this->_set_cdata_mode( 1 ); $this->_set_cdata_close( "" ); + $this->_set_pcdata_mode( 0 ); + } elsif ($it->string =~ /^<(title)\b/is) { + $this->_set_cdata_mode( 1 ); + $this->_set_cdata_close( "" ); + $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); *************** *** 415,419 **** --- 437,449 ---- $it .= $next->string; } + if ($this->pcdata_mode_p) { + my $check = $it; + $check =~ s/$re_directive//gos; + warn_pedantic "Markup found in PCDATA\n", $this->line_number, + \$pedantic_error_markup_in_pcdata_p + if $check =~ /$re_tag_compat/s; + } $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); + $this->_set_pcdata_mode, 0; $this->_set_cdata_close, undef; } From acli at users.sourceforge.net Wed Feb 25 07:25:31 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:25:31 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.26,1.27 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4769 Modified Files: TmplTokenizer.pm Log Message: After the previous change, the scanner will hang if the input is malformed in a certain way, such as having a but not matching . This should fix it. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** TmplTokenizer.pm 25 Feb 2004 06:08:41 -0000 1.26 --- TmplTokenizer.pm 25 Feb 2004 06:25:29 -0000 1.27 *************** *** 427,433 **** } } else { for ($it = '', my $cdata_close = $this->cdata_close;;) { my $next = $this->_next_token_internal($h); ! last if !defined $next; if (defined $next && $next->string =~ /$cdata_close/is) { $this->_push_readahead( $next ); # push entire TmplToken object --- 427,435 ---- } } else { + my $eof_p = 0; for ($it = '', my $cdata_close = $this->cdata_close;;) { my $next = $this->_next_token_internal($h); ! $eof_p = !defined $next; ! last if $eof_p; if (defined $next && $next->string =~ /$cdata_close/is) { $this->_push_readahead( $next ); # push entire TmplToken object *************** *** 437,440 **** --- 439,450 ---- $it .= $next->string; } + if ($eof_p) { + $it = undef; + error_normal "Unexpected end of file while looking for " + . $this->cdata_close + . "\n", $this->line_number_start; + $this->_set_fatal( 1 ); + $this->_set_syntaxerror( 1 ); + } if ($this->pcdata_mode_p) { my $check = $it; *************** *** 444,450 **** if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ); $this->_set_pcdata_mode, 0; ! $this->_set_cdata_close, undef; } return $it; --- 454,461 ---- if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ) ! if defined $it; $this->_set_pcdata_mode, 0; ! $this->_set_cdata_close, undef unless !defined $it; } return $it; From acli at users.sourceforge.net Wed Feb 25 07:49:37 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:49:37 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.27,1.28 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9557 Modified Files: TmplTokenizer.pm Log Message: Try to be a little bit more helpful with "Strange attribute syntax..." warnings. (Actually, is syntax like foo="bar"foo="bar" actually valid?) Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** TmplTokenizer.pm 25 Feb 2004 06:25:29 -0000 1.27 --- TmplTokenizer.pm 25 Feb 2004 06:49:35 -0000 1.28 *************** *** 296,300 **** $this->_set_fatal( 1 ); } else { ! warn_normal "Strange attribute syntax: $s\n", $lc; } } --- 296,306 ---- $this->_set_fatal( 1 ); } else { ! # There's something wrong with the attribute syntax. ! # We might be able to deduce a likely cause by looking more. ! if ($s =~ /^[a-z0-9]/is && "" =~ /^$re_tag_compat$/s) { ! warn_normal "Probably missing whitespace before or missing quotation mark near: $s\n", $lc; ! } else { ! warn_normal "Strange attribute syntax: $s\n", $lc; ! } } } From acli at users.sourceforge.net Wed Feb 25 07:56:44 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Tue, 24 Feb 2004 22:56:44 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.28,1.29 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10792 Modified Files: TmplTokenizer.pm Log Message: Ugly hack to avoid screenfuls of spurious warnings about "Possible SGML closed tag notation" Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** TmplTokenizer.pm 25 Feb 2004 06:49:35 -0000 1.28 --- TmplTokenizer.pm 25 Feb 2004 06:56:42 -0000 1.29 *************** *** 362,367 **** --- 362,373 ---- if ($tail eq '' && $post =~ $re_tmpl_var) { # Don't bother to show the warning if we're too confused + # FIXME. There's no method for _closed_start_tag_warning + if (!defined $this->{'_closed_start_tag_warning'} + || ($this->{'_closed_start_tag_warning'}->[0] eq $head + && $this->{'_closed_start_tag_warning'}->[1] != $this->line_number - 1)) { warn_normal "Possible SGML \"closed start tag\" notation: $head<\n", $this->line_number if split(/\n/, $head) < 10; + } + $this->{'_closed_start_tag_warning'} = [$head, $this->line_number]; } else { ($kind, $it) = (TmplTokenType::TAG, "$head>"); From acli at users.sourceforge.net Wed Feb 25 09:16:27 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Wed, 25 Feb 2004 00:16:27 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.29,1.30 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23579 Modified Files: TmplTokenizer.pm Log Message: This should now handle spurious "strange attribute syntax" much more sanely. Index: TmplTokenizer.pm =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** TmplTokenizer.pm 25 Feb 2004 06:56:42 -0000 1.29 --- TmplTokenizer.pm 25 Feb 2004 08:16:24 -0000 1.30 *************** *** 259,264 **** my($s, $lc) = @_; my %attr; ! $s = $1 if $s =~ /^<\S+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<\S+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { --- 259,264 ---- my($s, $lc) = @_; my %attr; ! $s = $1 if $s =~ /^<(?:(?!$re_directive_control)\S)+(.*)\/\S$/s # XML-style self-closing tags ! || $s =~ /^<(?:(?!$re_directive_control)\S)+(.*)\S$/s; # SGML-style tags for (my $i = 0; $s =~ /^(?:$re_directive_control)?\s+(?:$re_directive_control)?(?:([a-zA-Z][-a-zA-Z0-9]*)\s*=\s*)?('((?:$re_directive|[^'])*)'|"((?:$re_directive|[^"])*)"|((?:$re_directive|[^\s<>])+))/os;) { *************** *** 431,438 **** $this->_set_cdata_close( "" ); $this->_set_pcdata_mode( 0 ); ! } elsif ($it->string =~ /^<(title)\b/is) { ! $this->_set_cdata_mode( 1 ); ! $this->_set_cdata_close( "" ); ! $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); --- 431,438 ---- $this->_set_cdata_close( "" ); $this->_set_pcdata_mode( 0 ); ! # } elsif ($it->string =~ /^<(title)\b/is) { ! # $this->_set_cdata_mode( 1 ); ! # $this->_set_cdata_close( "" ); ! # $this->_set_pcdata_mode( 1 ); } $it->set_attributes( $this->_extract_attributes($it->string, $it->line_number) ); *************** *** 466,470 **** if $check =~ /$re_tag_compat/s; } ! $it = TmplToken->new( $it, TmplTokenType::CDATA, $this->line_number ) if defined $it; $this->_set_pcdata_mode, 0; --- 466,475 ---- if $check =~ /$re_tag_compat/s; } ! # PCDATA should be treated as text, not CDATA ! # Actually it should be treated as TEXT_PARAMETRIZED :-( ! $it = TmplToken->new( $it, ! ($this->pcdata_mode_p? ! TmplTokenType::TEXT: TmplTokenType::CDATA), ! $this->line_number ) if defined $it; $this->_set_pcdata_mode, 0; *************** *** 856,859 **** --- 861,868 ---- turned on using the set_cformat(1) method call. + =head1 BUGS + + There is no code to save the tag name anywhere in the scanned token. + =head1 HISTORY From acli at users.sourceforge.net Wed Feb 25 09:16:37 2004 From: acli at users.sourceforge.net (Ambrose C. LI) Date: Wed, 25 Feb 2004 00:16:37 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator intranet.zh_TW,1.17,1.18 opac.zh_TW,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23668 Modified Files: intranet.zh_TW opac.zh_TW Log Message: Minor updates Index: intranet.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/intranet.zh_TW,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** intranet.zh_TW 24 Feb 2004 00:48:18 -0000 1.17 --- intranet.zh_TW 25 Feb 2004 08:16:34 -0000 1.18 *************** *** 4,7 **** --- 4,9 ---- # Copyright 2004 Ambrose Li # + # $Header$ + # # FIXME words tentatively translated: active, home branch, illustration, illustrator, inactive, order, receive, seen # FIXME tentative: bookfund: ?????????????????? *************** *** 12,16 **** msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-05 20:55-0500\n" "PO-Revision-Date: 2004-02-23 17:20-0500\n" "Last-Translator: Ambrose Li \n" --- 14,18 ---- msgstr "" "Project-Id-Version: Koha INTRANET 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-25 03:08-0500\n" "PO-Revision-Date: 2004-02-23 17:20-0500\n" "Last-Translator: Ambrose Li \n" *************** *** 25,32 **** msgstr "\" %s" - #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:41 - msgid "\">" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:14 msgid "$ rrp" --- 27,30 ---- *************** *** 573,581 **** msgstr "-) ??????" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:131 - #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:44 - msgid "-->" - msgstr "" - #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:108 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:165 --- 571,574 ---- *************** *** 641,645 **** msgstr "-> ?????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:3 msgid "2; url=" msgstr "" --- 634,638 ---- msgstr "-> ?????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:4 msgid "2; url=" msgstr "" *************** *** 832,840 **** msgstr "?????????%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:123 - #, c-format - msgid "Description: %s" - msgstr "?????????%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:50 #, c-format --- 825,828 ---- *************** *** 1073,1082 **** #, c-format msgid "This record is used %s times. Deletion not possible" ! msgstr "" ! ! #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:122 ! #, c-format ! msgid "Title: %s" ! msgstr "?????????%s" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:31 --- 1061,1065 ---- #, c-format msgid "This record is used %s times. Deletion not possible" ! msgstr "???????????????????????? %s ??????????????????" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:31 *************** *** 1108,1116 **** msgstr "?????????%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:124 - #, c-format - msgid "URL:http://%s" - msgstr "?????????http://%s" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:29 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:39 --- 1091,1094 ---- *************** *** 1293,1297 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:28 msgid "ACTUAL" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:73 --- 1271,1275 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:28 msgid "ACTUAL" ! msgstr "??????" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:73 *************** *** 1728,1735 **** msgstr "??????" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:118 - msgid "Associated Websites" - msgstr "????????????" - #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:55 #, c-format --- 1706,1709 ---- *************** *** 1761,1765 **** #: ../../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:15 msgid "Author" msgstr "??????" --- 1735,1739 ---- #: ../../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 msgid "Author" msgstr "??????" *************** *** 1892,1896 **** msgstr "??????????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:9 msgid "Biblios found" msgstr "????????????" --- 1866,1870 ---- msgstr "??????????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:10 msgid "Biblios found" msgstr "????????????" *************** *** 3222,3226 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:68 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:28 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:16 msgid "ISBN" msgstr "ISBN" --- 3196,3200 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:68 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:28 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:17 msgid "ISBN" msgstr "ISBN" *************** *** 3326,3330 **** msgstr "???????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:28 msgid "Import this biblio" msgstr "??????????????????" --- 3300,3304 ---- msgstr "???????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:29 msgid "Import this biblio" msgstr "??????????????????" *************** *** 3753,3760 **** msgstr "??????Koha????????????????????????" - #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:117 - msgid "Links to" - msgstr "?????????" - #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:140 msgid "List Item Price Includes GST" --- 3727,3730 ---- *************** *** 3967,3971 **** #, fuzzy msgid "Mark seen" ! msgstr "Mike Hansen" #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:82 --- 3937,3941 ---- #, fuzzy msgid "Mark seen" ! msgstr "????????????" #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:82 *************** *** 4363,4372 **** msgstr "????????????" #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:18 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:20 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:46 - #, fuzzy msgid "Normal" ! msgstr "??????" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:131 --- 4333,4342 ---- msgstr "????????????" + # FIXME This does not seem too sound. The code looks puzzling. Need to re-check. #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:18 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:20 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:46 msgid "Normal" ! msgstr "??????" #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:131 *************** *** 4434,4438 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:55 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:88 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:32 msgid "Nothing found" msgstr "??????????????????" --- 4404,4408 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:55 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:88 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:33 msgid "Nothing found" msgstr "??????????????????" *************** *** 5569,5573 **** msgstr "?????????????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:35 #, c-format msgid "Still %s requests to go" --- 5539,5543 ---- msgstr "?????????????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:36 #, c-format msgid "Still %s requests to go" *************** *** 5907,5911 **** #: ../../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:14 msgid "Title" msgstr "??????" --- 5877,5881 ---- #: ../../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 msgid "Title" msgstr "??????" *************** *** 6428,6432 **** msgstr "Z39.50???????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:5 msgid "Z3950 Search Results" msgstr "Z3950????????????" --- 6398,6402 ---- msgstr "Z39.50???????????????" ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:6 msgid "Z3950 Search Results" msgstr "Z3950????????????" *************** *** 6535,6541 **** #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:69 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:17 msgid "coming from" ! msgstr "" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:29 --- 6505,6511 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:69 ! #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:18 msgid "coming from" ! msgstr "??????" #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:29 *************** *** 6546,6552 **** #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:12 - #, fuzzy msgid "dir. de publication" ! msgstr "????????????" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:262 --- 6516,6521 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:12 msgid "dir. de publication" ! msgstr "??????" #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:262 *************** *** 6831,6834 **** --- 6800,6804 ---- #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:7 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:7 + #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:2 msgid "text/html; charset=iso-8859-1" msgstr "text/html; charset=utf-8" *************** *** 6917,6918 **** --- 6887,7006 ---- msgid "z3950 search" msgstr "z3950??????" + + #, fuzzy + #~ msgid "    - - Average Borrowings" + #~ msgstr "??????- - ??????????????????" + + #, fuzzy + #~ msgid "    - - Total Borrowings" + #~ msgstr "??????- - ??????????????????" + + #, fuzzy + #~ msgid "    - - Update Details" + #~ msgstr "??????- ???????????????" + + #, fuzzy + #~ msgid "    - All Books Out" + #~ msgstr "??????- - ??????" + + #, fuzzy + #~ msgid "    - Audit Reports" + #~ msgstr "??????- ??????" + + #, fuzzy + #~ msgid "    - Catalogue Search" + #~ msgstr "??????- ????????????" + + #, fuzzy + #~ msgid "    - Fundview CD" + #~ msgstr "??????- Levin" + + #, fuzzy + #~ msgid "    - History" + #~ msgstr "??????- Foxton" + + #, fuzzy + #~ msgid "    - Intranet Help" + #~ msgstr "??????- ??????" + + #, fuzzy + #~ msgid "    - Member Details" + #~ msgstr "??????- ???????????????" + + #, fuzzy + #~ msgid "    - Messages" + #~ msgstr "??????- ??????" + + #~ msgid "    - Overdues" + #~ msgstr "??????- ??????" + + #~ msgid "    - Renew Books" + #~ msgstr "??????- ??????" + + #~ msgid "    - Searching Help" + #~ msgstr "??????- ????????????" + + #~ msgid "    - Set New Budgets" + #~ msgstr "??????- ??????????????????" + + #, fuzzy + #~ msgid "    - Stocktake" + #~ msgstr "??????- ??????" + + #, fuzzy + #~ msgid "    - Telnet Help" + #~ msgstr "??????- ??????" + + #, fuzzy + #~ msgid "-> Borrower Enquiry" + #~ msgstr "????????????" + + #~ msgid "-> Help" + #~ msgstr "-> ????????????" + + #, fuzzy + #~ msgid "-> Resources" + #~ msgstr "-> ??????" + + #~ msgid "Description: %s" + #~ msgstr "?????????%s" + + #~ msgid "Title: %s" + #~ msgstr "?????????%s" + + #~ msgid "URL:http://%s" + #~ msgstr "?????????http://%s" + + #~ msgid "Add to shelf" + #~ msgstr "?????????????????????" + + #~ msgid "Add to virtual shelf" + #~ msgstr "?????????????????????" + + #~ msgid "Add to virtual shelf : %s" + #~ msgstr "????????????????????????%s" + + #~ msgid "Associated Websites" + #~ msgstr "????????????" + + #~ msgid "Author : %s" + #~ msgstr "?????????%s" + + #~ msgid "Links to" + #~ msgstr "?????????" + + #~ msgid "Not Reservable" + #~ msgstr "????????????" + + #~ msgid "OTHER" + #~ msgstr "??????" + + #~ msgid "Title : %s" + #~ msgstr "?????????%s" + + #~ msgid "select" + #~ msgstr "??????" + + # XXX can improve + #~ msgid "you are in ISSUES & RETURNS" + #~ msgstr "???????????????????????????" Index: opac.zh_TW =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/opac.zh_TW,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** opac.zh_TW 24 Feb 2004 03:21:37 -0000 1.8 --- opac.zh_TW 25 Feb 2004 08:16:34 -0000 1.9 *************** *** 7,11 **** msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-23 22:05-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" --- 7,11 ---- msgstr "" "Project-Id-Version: Koha OPAC 2.0.0RC4\n" ! "POT-Creation-Date: 2004-02-25 03:21-0500\n" "PO-Revision-Date: 2004-02-18 02:40-0500\n" "Last-Translator: Ambrose Li \n" From oleonard at users.sourceforge.net Wed Feb 25 18:28:47 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:28:47 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6866/koha-tmpl/intranet-tmpl/npl/en/acqui Modified Files: acqui-home.tmpl Log Message: Minor correction to HTML (closing input tags) Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** acqui-home.tmpl 19 Feb 2004 18:59:36 -0000 1.1 --- acqui-home.tmpl 25 Feb 2004 17:28:43 -0000 1.2 *************** *** 27,31 **** ! --- 27,31 ---- ! *************** *** 47,52 ****
    ! ! " name="" value="">
    --- 47,52 ----
    ! ! " name="" value="" />
    From oleonard at users.sourceforge.net Wed Feb 25 18:51:16 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:51:16 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.64.2.3,1.64.2.4 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11874/circ Modified Files: Tag: rel_2_0 circulation.pl Log Message: Small changes to help fix Bug 436 Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.64.2.3 retrieving revision 1.64.2.4 diff -C2 -r1.64.2.3 -r1.64.2.4 *** circulation.pl 28 Jan 2004 21:50:17 -0000 1.64.2.3 --- circulation.pl 25 Feb 2004 17:51:09 -0000 1.64.2.4 *************** *** 88,92 **** if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "No borrower matched '$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); --- 88,92 ---- if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); *************** *** 230,233 **** --- 230,234 ---- my $tcolor = ''; my $pcolor = ''; + my $od = ''; foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){ my $dd = $book->{'date_due'}; *************** *** 235,245 **** $dd=format_date($dd); $datedue=~s/-//g; - # FIXME - Instead of declaring the font color here, can we set a variable - # that says 'overdue'? Then the template can check for it: if ($datedue < $todaysdate) { ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; --- 236,245 ---- $dd=format_date($dd); $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); + $book->{'od'}=$od; $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; *************** *** 264,274 **** $dd=format_date($dd); my $pcolor = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! # FIXME - See line 233 above regarding overdues ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ --- 264,276 ---- $dd=format_date($dd); my $pcolor = ''; + my $od = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; + $book->{'od'}=$od; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ From oleonard at users.sourceforge.net Wed Feb 25 18:53:51 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 09:53:51 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.15.2.4,1.15.2.5 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12834/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: Tag: rel_2_0 circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.15.2.4 retrieving revision 1.15.2.5 diff -C2 -r1.15.2.4 -r1.15.2.5 *** circulation.tmpl 23 Feb 2004 21:22:00 -0000 1.15.2.4 --- circulation.tmpl 25 Feb 2004 17:53:47 -0000 1.15.2.5 *************** *** 5,9 **** ! &printer=&print=yes"> Next Borrower  --- 5,9 ---- ! &branch=&printer=&print=yes"> Next Borrower  *************** *** 14,21 **** !

    Circulation: Issues

    ! Branch: Printer:     Change Settings "> "> --- 14,24 ----
    !

    Circulation: Issues


    ! Branch:
    ! Printer:
    ! Change Settings "> "> +

     

    *************** *** 35,39 **** Branch:
    Printer:
    ! Change Settings"> "> --- 38,42 ---- Branch:
    Printer:
    ! Change Settings"> "> *************** *** 120,124 ****
    !
    /images/background-mem.gif">Messages
    --- 123,127 ---- !
    /images/background-mem.gif">Messages
    No borrower matched
    *************** *** 138,142 ****
    ! --- 141,145 ----
    ! *************** *** 169,173 ****
    ! ! ! ! ! ! ! ! ! ! ! !
    --- 172,176 ---- ! ! --- 187,191 ---- ! *************** *** 222,226 **** !
    *************** *** 184,188 **** Item Barcode:
    Item Barcode:
    ! ! --- 305,309 ---- ! From oleonard at users.sourceforge.net Wed Feb 25 19:20:15 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:20:15 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.1,1.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19245/koha-tmpl/intranet-tmpl/npl/en/circ Modified Files: circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** circulation.tmpl 19 Feb 2004 19:02:58 -0000 1.1 --- circulation.tmpl 25 Feb 2004 18:20:05 -0000 1.2 *************** *** 55,59 ****
    ! Add a new patron
    --- 55,59 ----
    ! No patron matched Add a new patron
    From kb2qzv at users.sourceforge.net Wed Feb 25 20:49:04 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:49:04 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters currency.tmpl,1.8,1.9 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10320/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: currency.tmpl Log Message: Added > and < instead of << >>. Index: currency.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** currency.tmpl 11 Feb 2004 09:02:55 -0000 1.8 --- currency.tmpl 25 Feb 2004 19:49:01 -0000 1.9 *************** *** 192,196 **** ! << Prev --- 192,196 ---- ! << Prev *************** *** 198,202 **** ! Next >> --- 198,202 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:49:48 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:49:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters printers.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10830/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: printers.tmpl Log Message: Added > and < instead of << >>. Index: printers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** printers.tmpl 11 Feb 2004 09:02:55 -0000 1.9 --- printers.tmpl 25 Feb 2004 19:49:46 -0000 1.10 *************** *** 185,189 **** ! << Prev --- 185,189 ---- ! << Prev *************** *** 191,195 **** ! Next >> --- 191,195 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:50:26 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:50:26 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters stopwords.tmpl,1.11,1.12 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10978/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: stopwords.tmpl Log Message: Added > and < instead of << >>. Index: stopwords.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** stopwords.tmpl 9 Dec 2003 10:29:01 -0000 1.11 --- stopwords.tmpl 25 Feb 2004 19:50:23 -0000 1.12 *************** *** 157,161 **** ! << Prev --- 157,161 ---- ! << Prev *************** *** 163,167 **** ! Next >> --- 163,167 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:51:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:51:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters z3950servers.tmpl,1.12,1.13 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11158/koha-tmpl/intranet-tmpl/default/en/parameters Modified Files: z3950servers.tmpl Log Message: Added > and < instead of << >>. Index: z3950servers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** z3950servers.tmpl 11 Feb 2004 09:02:55 -0000 1.12 --- z3950servers.tmpl 25 Feb 2004 19:51:08 -0000 1.13 *************** *** 270,274 **** ! << Prev --- 270,274 ---- ! << Prev *************** *** 276,280 **** ! Next >> --- 276,280 ---- ! Next >> From kb2qzv at users.sourceforge.net Wed Feb 25 20:54:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:54:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue searchresults.tmpl,1.9,1.10 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12161/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: searchresults.tmpl Log Message: removal of 2 quotation marks from the bgcolor= so that translator is happy. Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** searchresults.tmpl 20 Feb 2004 02:49:26 -0000 1.9 --- searchresults.tmpl 25 Feb 2004 19:54:57 -0000 1.10 *************** *** 63,67 ****     ! !
    Borrower information
    --- 225,229 ---- ! ! --- 245,249 ---- ! *************** *** 260,264 **** ! --- 263,267 ---- ! *************** *** 270,276 ****
    Borrower information
    *************** *** 242,246 ****
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    >
    CHARGES>" onClick="openWindow(this, 'Payment', 480,640)">Payment
    ODUESYes, See below
    ODUESYes, See below
    !
    !
    /images/background-mem.gif"> --- 273,279 ----
    !



    ! ! --- 308,312 ---- ! From oleonard at users.sourceforge.net Wed Feb 25 19:09:31 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:09:31 -0800 Subject: [Koha-cvs] CVS: koha/circ circulation.pl,1.67,1.68 Message-ID: Update of /cvsroot/koha/koha/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17014/circ Modified Files: circulation.pl Log Message: Small changes to help fix Bug 436 Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -r1.67 -r1.68 *** circulation.pl 11 Feb 2004 08:42:02 -0000 1.67 --- circulation.pl 25 Feb 2004 18:09:29 -0000 1.68 *************** *** 88,92 **** if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "No borrower matched '$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); --- 88,92 ---- if ($#borrowers == -1) { $query->param('findborrower', ''); ! $message = "'$findborrower'"; } elsif ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); *************** *** 230,233 **** --- 230,234 ---- my $tcolor = ''; my $pcolor = ''; + my $od = ''; foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){ my $dd = $book->{'date_due'}; *************** *** 235,245 **** $dd=format_date($dd); $datedue=~s/-//g; - # FIXME - Instead of declaring the font color here, can we set a variable - # that says 'overdue'? Then the template can check for it: if ($datedue < $todaysdate) { ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; --- 236,245 ---- $dd=format_date($dd); $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($tcolor eq $linecolor1) ? ($tcolor=$linecolor2) : ($tcolor=$linecolor1); + $book->{'od'}=$od; $book->{'dd'}=$dd; $book->{'tcolor'}=$tcolor; *************** *** 264,274 **** $dd=format_date($dd); my $pcolor = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! # FIXME - See line 233 above regarding overdues ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ --- 264,276 ---- $dd=format_date($dd); my $pcolor = ''; + my $od = ''; $datedue=~s/-//g; if ($datedue < $todaysdate) { ! $od = 'true'; ! $dd="$dd\n"; } ($pcolor eq $linecolor1) ? ($pcolor=$linecolor2) : ($pcolor=$linecolor1); $book->{'dd'}=$dd; + $book->{'od'}=$od; $book->{'tcolor'}=$pcolor; if ($book->{'author'} eq ''){ From oleonard at users.sourceforge.net Wed Feb 25 19:15:38 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 10:15:38 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.17,1.18 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18312/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: circulation.tmpl Log Message: Small changes to help fix Bug 436 Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** circulation.tmpl 20 Feb 2004 02:49:26 -0000 1.17 --- circulation.tmpl 25 Feb 2004 18:15:35 -0000 1.18 *************** *** 120,124 ****
    /images/background-mem.gif"> *************** *** 305,309 ****
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    !
    /images/background-mem.gif">Messages
    --- 120,124 ---- !
    /images/background-mem.gif">Messages
    No borrower matched
    *************** *** 305,309 ****
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
    "> "> &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! bgcolor="#99cccc" background="/images/background-opac.gif"bgcolor="#ccccff" background="/images/background-mem.gif"> ! !
    --- 63,67 ---- ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> ! ! ! !
    From kb2qzv at users.sourceforge.net Wed Feb 25 20:56:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 11:56:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.6,1.7 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12663/koha-tmpl/intranet-tmpl/default/en/circ Modified Files: branchtransfers.tmpl Log Message: missing ; added to the end of   Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** branchtransfers.tmpl 9 Dec 2003 10:29:05 -0000 1.6 --- branchtransfers.tmpl 25 Feb 2004 19:56:55 -0000 1.7 *************** *** 9,13 ****

    Circulation: Transfers


    ! Branch:   Printer:
    Change Settings --- 9,13 ----

    Circulation: Transfers


    ! Branch:   Printer:
    Change Settings From oleonard at users.sourceforge.net Wed Feb 25 21:01:56 2004 From: oleonard at users.sourceforge.net (Owen Leonard) Date: Wed, 25 Feb 2004 12:01:56 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.14.2.2,1.14.2.3 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13887/koha-tmpl/intranet-tmpl/default/en/catalogue Modified Files: Tag: rel_2_0 MARCdetail.tmpl Log Message: Changing French string to English, cleaning up some HTML markup Index: MARCdetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -C2 -r1.14.2.2 -r1.14.2.3 *** MARCdetail.tmpl 19 Feb 2004 10:22:46 -0000 1.14.2.2 --- MARCdetail.tmpl 25 Feb 2004 20:01:54 -0000 1.14.2.3 *************** *** 8,24 **** ! ! ! ! ! ! ! ! ! ! ! !
    ! /images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! !
    ! ! ! ! ! ! --- 8,24 ---- !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">Print')">Add to shelf MARC biblio :
    ! /images/background-mem.gif"> *************** *** 103,114 ****
    ! ! ! ! ! ! *************** *** 27,44 **** ! ! --- 50,54 ---- ! " class="button">Request *************** *** 57,63 ****
    !
    ">//images/fileopen.png">//images/edittrash.png">">Normal')">Print')">Add to shelf MARC biblio :
    ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    --- 27,44 ----
    ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    *************** *** 50,54 **** ! class="button">Request
    ! /images/background-mem.gif"> --- 57,63 ----
    !
    ! /images/background-mem.gif"> *************** *** 74,80 ****
    ! /images/background-mem.gif"> --- 74,80 ----
    ! /images/background-mem.gif"> *************** *** 91,97 ****
    ! /images/background-mem.gif"> --- 91,97 ----
    ! /images/background-mem.gif"> *************** *** 108,114 ****
    ! /images/background-mem.gif"> --- 108,114 ----
    ! /images/background-mem.gif"> *************** *** 125,131 ****
    ! /images/background-mem.gif"> --- 125,131 ----
    ! /images/background-mem.gif"> *************** *** 142,148 ****
    ! /images/background-mem.gif"> --- 142,148 ----
    ! /images/background-mem.gif"> *************** *** 159,165 ****
    ! /images/background-mem.gif"> --- 159,165 ----
    ! /images/background-mem.gif"> *************** *** 176,182 ****
    ! /images/background-mem.gif"> --- 176,182 ----
    ! /images/background-mem.gif"> *************** *** 193,199 ****
    ! /images/background-mem.gif"> --- 193,199 ----
    ! /images/background-mem.gif"> *************** *** 210,216 ****
    ! /images/background-mem.gif"> --- 210,216 ----
    ! /images/background-mem.gif"> *************** *** 227,231 ****
    /images/background-mem.gif"> --- 227,231 ----
    /images/background-mem.gif"> *************** *** 239,243 **** !

    Modify category

    Dodaj kategori??

    name=Aform method=post>
    Kod Kategorii >
    Kod Kategorii
    Wyja??nienie  
    Enrollment period
    G??rna granica wieku
    Wymagany Wiek
    Enrollment fee
    Overdue notice required
    Issue limit
    Reserve fee
     
    Data recorded
    method=post>
    TOTAL : :
    > Data deleted

    Kategoria admin

    Szukano >
    Kod Kategorii
    Wyja??nienie
    Enrollment period
    G??rna granica wieku
    Wymagany Wiek
    Fine type
    Enrollment fee
    Overdue notice required TakNie
    Issue limit
    Reserve fee
    Ten rekord by?? w u??yciu razy. Wymazanie nie jest mo??liwe
    POTWIERDZENIE WYMAZANIA
    Kategoria Wyja??nienie Enrollment period Enrollment fee G??rna Granica Wieku Wymagany Wiek Fine Overdue Issue limit Reserve
    Tak Nie /images/fileopen.png" width=32 hspace=0 vspace=0 border=0> //images/edittrash.png" border="0">


    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:31 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/members member-password.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6558/members Added Files: Tag: rel_2_0 member-password.tmpl Log Message: translation update --- NEW FILE --- Click here to continue to see Member Info.

    ,

    > You have entered a UserID that already exists. Please choose another one.
    New UserID: >
    New Password: >

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:31 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:31 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/catalogue detailprint.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6558/catalogue Added Files: Tag: rel_2_0 detailprint.tmpl Log Message: translation update --- NEW FILE ---
    WIERSZ OPISU



    Wydana przez : w , ,
    Kolekcja:
    Przedmiot:
    Rok :
    Uwagi:
    Tytu?? Ujednolicony:
    Dewey: ">
    Klasyfikacja:
    LCCN:
    URL: ">
    ISBN:
    ,
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:33:58 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:33:58 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters categoryitem.tmpl,NONE,1.1.2.1 charges.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6713/parameters Added Files: Tag: rel_2_0 categoryitem.tmpl charges.tmpl checkmarc.tmpl Log Message: translation update --- NEW FILE ---

    Modify category

    Dodaj kategori??

    name=Aform method=post>
    Kod Kategorii >
    Kod Kategorii
    Wyja??nienie >  
    Enrolment period >
    G??rna granica wieku >
    Wymagany Wiek >
    Fine type >
    Bulk >
    Enrolment fee >
    Overdue notice required >
    Issue limit >
    Reserve fee >
     
    Data recorded method=post>
    TOTAL : :
    > Data deleted

    Kategoria admin

    Szukano >
    Kod Kategorii
    Wyja??nienie
    Enrolment period
    G??rna granica wieku
    Wymagany Wiek
    Fine type
    Bulk
    Enrolment fee
    Overdue notice required
    Issue limit
    Reserve fee
    Ten rekord by?? w u??yciu razy. Wymazanie nie jest mo??liwe
    POTWIERDZENIE WYMAZANIA
    Kategoria Wyja??nienie Enrolment G??rna Granica Wieku Wymagany Wiek Fine Bulk Op??ata Overdue Issue limit Reserve
    Edytuj Wyma??


    --- NEW FILE ---

    Each box needs to be filled in with fine,time to start charging,charging cycle
    eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days

    Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night

     
    "> " value="" size=6 maxlength=10>
    --- NEW FILE ---
    Test Result
    itemnum
  • The field itemnum MUST be mapped
  • The correspounding subfield MUST be in with -1 (ignore) tab
    		•
    OK itemnum : the field itemnumber is mapped to a field in tab -1
    item fields ALL items fields MUST :
  • be mapped to the same tag,
  • and they must all be in the 10 (items) tab
    		•
    OK Wszystkie pola pozycji s?? w tym samym znaczniku i w zak??adce pozycji
    itemtypes table empty the itemtypes table is empty. It must contain at least 1 value
    OK itemtypes table filled with at least 1 value
    itemtype NOT mapped the biblioitems.itemtype field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised_value=itemtype
    		•
    OK biblioitems.itemtype defined
    branch table empty the branch table is empty. It must contain at least 1 value !
    OK branch table filled with at least 1 value
    homebranch NOT mapped the items.homebranch field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised value=branches
    		•
    OK homebranch defined
    holdingbranch NOT mapped the items.holdingbranch field MUST :
  • be mapped to a MARC subfield,
  • the correspounding subfield MUST have authorised value=branches
    		•
    OK holdingbranch defined
    biblio and biblionumber The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
  • be mapped to a MARC subfield,
  • be in the SAME tag (for example : 090$a and 090$b)
  • be in tab -1
    		•
    OK biblionumber and biblioitemnumber mapped correctly
    TOTAL You have error(s) in your MARC configuration. Please fix them before using koha
      Configuration OK, you don't have errors in your MARC parameters table
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:34:42 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:34:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters currency.tmpl,NONE,1.1.2.1 itemtypes.tmpl,NONE,1.1.2.1 printers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6942/parameters Added Files: Tag: rel_2_0 currency.tmpl itemtypes.tmpl printers.tmpl Log Message: translation update --- NEW FILE ---

    Modify currency

    Dodaj walut??

    Currency
    Currency
    Rate
    Data recorded
    Currency
    Rate
    Ten rekord by?? w u??yciu razy. Wymazanie nie jest mo??liwe
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Currencies admin

    >
    You searched for
    Currency Rate
    Edytuj Wyma??
    << Wstecz        Dalej >>

    --- NEW FILE ---

    Modify item type

    Dodaj typ pozycji

    Typ pozycji>
    Typ pozycji
    Wyja??nienie  
    Not for loan if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item
    Okres wypo??yczenia meaningful only if not for loan is not set
    Wolno Przed??u??a?? checked value=1>
    Op??ata wynajmu
     
    Typ pozycji
    Wyja??nienie
    Okres wypo??yczenia
    Przed??u??eniaMo??liweNot allowed
    Op??ata wynajmu
    Ten rekord by?? w u??yciu razy. Wymazanie nie jest mo??liwe
    POTWIERDZENIE WYMAZANIA

    Typ Pozycji Admin

    Kod Wyja??nienie Okres wypo??yczenia Renewable Op??ata Edytuj Wyma??
    TakNie ?op=add_form&itemtype=">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0> ?op=delete_confirm&itemtype=">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>

    //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> //images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    --- NEW FILE ---

    Modify printer

    Dodaj drukark??

    Nazwa Drukarki
    Nazwa Drukarki
    Queue
    Typ
    Data recorded
    Drukarka
    Queue
    Typ
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Drukarka Admin (fixme)

    >
    You searched for
    Imi?? i Nazwisko Queue Typ
    Edytuj Wyma??
    << Wstecz        Dalej >>

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:35:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:35:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/reports inventory.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7124/reports Added Files: Tag: rel_2_0 inventory.tmpl Log Message: --- NEW FILE ---

    Inventory/Stocktaking

    Select items you want to check
    Item Location (items.bulk) between "> and ">
    not seen since ">
    show "> items beginning at offset ">
    "> "> "> "> ">
    Seen Kod Paskowy Bulk Tytu?? Autor
    " value="1">
    "> "> "> "> ">
    "> "> "> "> ">
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:35:10 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:35:10 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters stopwords.tmpl,NONE,1.1.2.1 z3950servers.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7124/parameters Added Files: Tag: rel_2_0 stopwords.tmpl z3950servers.tmpl Log Message: --- NEW FILE ---

    Modify word

    Dodaj s??owo

    S??owo
    S??owo
    Data recorded
    S??owo
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Stop words admin

    NOTE : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.
    >
    You searched for
    S??owo
    Wyma??
    << Wstecz        Dalej >>

    --- NEW FILE ---

    Modify Z39.50 Server

    Dodaj Serwer Z39.50

    Z39.50 Server
    Z39.50 Server
    Hostname
    Port
    Database
    U??ytkownik
    Password
    Checked (searched by default)
    Rank (display order)
    Syntax (z3950 can send records in various format. Choose one)
    Data recorded
    >
    Site
    Hostname
    Port
    Database
    U??ytkownik
    Password
    Checked
    Rank
    POTWIERDZENIE WYMAZANIA
    Data deleted

    Z39.50 Servers admin

    >
    You searched for
    Site Hostname Port Database U??ytkownik Password Checked Rank Syntax
    //images/fileopen.png" alt="Edytuj" title="edit" border=0> //images/edittrash.png" alt="Wyma??" title="delete" border=0>
    << Wstecz        Dalej >>

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:37:21 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:37:21 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/search.marc result.tmpl,NONE,1.1.2.1 search.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7488/search.marc Added Files: Tag: rel_2_0 result.tmpl search.tmpl Log Message: --- NEW FILE --- Wyniki szukania MARC
    &=&resultsperpage=&type=intranet&op=do_search> &=&resultsperpage=&type=intranet&op=do_search> &=&&resultsperpage=&type=intranet&op=do_search>
     Wy??wietlono od do z

      Nic nie znaleziono.
    Opis # Autor Tytu??
    ">
    &=&resultsperpage=&type=intranet&op=do_search> &=&resultsperpage=&type=intranet&op=do_search> &=&&resultsperpage=&type=intranet&op=do_search>
    --- NEW FILE --- Szukanie MARC
    ">
    		POMOC :
    Zbuduj kwerend?? stosuj??c pola i podpola MARC. "Dodaj kryteria " pozwala na dodanie innych kryteri??w wyszukiwania. "Szukaj" przesy??a kwerend?? i wy??wietla wyniki.
      value="">

    Liczba wy??wietle?? na stron??:
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:37:55 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:37:55 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/value_builder unimarc_field_105.tmpl,NONE,1.1.2.1 unimarc_field_60X.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7583/value_builder Added Files: Tag: rel_2_0 unimarc_field_105.tmpl unimarc_field_60X.tmpl Log Message: --- NEW FILE --- UNIMARC Field 100 builder
    Date d'enregistrement ">
    Code date publication
    Ann??e d??but ">
    Ann??e fin ">
    --- NEW FILE --- Szukaj w tezaurusie

    Search

    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
    "> "> ">

    Wyniki

    &level=&search_string="> ')">

    Dependancies

    &level=&search_string=+"> ')">

    Dodawanie

    "> "> Create a new authority/thesaurus entry : ">
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:38:27 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:38:27 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/z3950 searchresult.tmpl,NONE,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7705/z3950 Added Files: Tag: rel_2_0 searchresult.tmpl Log Message: --- NEW FILE --- "> Wyniki Szukania Z3950
    Znalezione Opisy
    ">
    Tytu?? Autor ISBN coming from    
    )">Import this biblio
    Nothing found

    Still requests to go


    From kb2qzv at users.sourceforge.net Sun Feb 29 20:39:53 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:39:53 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui acqui-home.tmpl,1.1,1.1.2.1 acquire.tmpl,1.1,1.1.2.1 basket.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8009/acqui Modified Files: Tag: rel_2_0 acqui-home.tmpl acquire.tmpl basket.tmpl Log Message: Index: acqui-home.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acqui-home.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** acqui-home.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- acqui-home.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Akwizycje


    ! --- 69,98 ----
    ! SK?ADANIE ZAM?WIENIA, ODBI?R LUB MODYFIKACJA
    Nazwa dostawcy
    --- 1,14 ---- ! !

    Gromadzenie


    ! ! ! ! ! ! --- 41,56 ---- ! ! ! *************** *** 63,67 **** ! --- 63,67 ---- ! *************** *** 69,97 ****
    ! START, RECEIVE, MODIFY ANY ORDER
    Supplier Name *************** *** 21,29 ****
    ! ODBI?R LUB MODYFIKACJA ZAM?WIE? REGULARNYCH
    Wyszukiwanie tytu?owe --- 21,29 ----
    ! RECEIVE OR MODIFY PERIODICAL ORDER
    Szukaj wg. Tytu??u *************** *** 41,56 ****
    KURSY WYMIANY
    ! ! " value=>
    EXCHANGE RATES
    ! ! " value=>
    BUD?ET ORAZ WYDATKI KSI?GARSKIE
    BUDGET I FUNDUSZE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Bud?etSumaWydanoAlokowanoDost?pne
    Total

    ! Zastosuj kombinacj? klawiszy [ctrl + r] aby wy?wietli? uaktualnione cyfry. ! Podane cyfry s? przybli?one, gdy? kurs wymiany wp?ywa na kwot? faktycznie zap?acon?.
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Budgets TotalSpentComtdAvail
    Total
    !

    ! Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid. !

    !

    POMOC zam?wienia:

    !
      By rozpocz?? akwizycj?, niezale?nie czy jest to zam?wienie, zakup w?asny czy darowizna najpierw wyszukaj dostawc?, dodaj go je?li potrzeba.
    !
      Nast?pnie wybierz poprzedni koszyk lub utw?rz nowy. Uwaga, koszyk b?dzie nale?a? do nazwy u?ytkownika z jak? si? zalogowa?e?/a?.
    !
      Aby z?ozy? zam?wienie nale?y ustali? czy istnieje ju? opis dla pozycji, nast?pnie albo doda? pozycj? albo wstawi? nowy opis i doda? pozycj?.
    !

    W celu zamkni?cia koszyka kliknij na "zobacz koszyki" lub szukaj powy?ej, a nast?pnie naci?nij "zatwierd? koszyk".

    !
    ! --- 104,115 ----
    !

    HELP Ordering:

    !
      To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.
    !
      Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to
    !
      To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.
    !

    To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".

    !
    ! Index: acquire.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acquire.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** acquire.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- acquire.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,14 **** !
    ! Rachunek:
    ! Otrzymany przez:
    !
    !

    Receipt Summary for: Invoice,

    ! !

    - Odbi?r zam?wienia


    ! Koszyk dla: !
    Zam?wienie z?o?one:

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 25,91 ---- !

    - Przyjmij Zam??wienie


    ! Shopping Basket For: !
    Order placed:

    /images/background-mem.gif" colspan=2> ! SZCZEG??Y KATALOGU
    Tytu? *" >
    Autor" >
    Data Copyright" >
    Format
    ISBN">
    Series">
    Oddzia?
    Kod kreskowy pozycji *">
    Informacje tomowe (for serials) *
    ! > ! > ! > ! "> ! "> ! "> ! ! /images/filesave.png" border=0 title="continue" alt="save" border=0 border=0> ! ! &id=>/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 93,134 ****
    /images/background-mem.gif" colspan=2> ! SZCZEG????Y KATALOGU
    Tytu??*" >
    Autor" >
    Copyright Date" >
    Format
    ISBN">
    Series">
    Oddzia??
    Item Barcode *">
    Oznaczenie tomowe (dla serii) *
    ! > ! > ! > ! "> ! "> ! "> ! ! ! ! &id=>Edytuj !
    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DETALE KSI?GOWO-FINANSOWE
    Bookfund *
    Ilo?? zam?wiona">
    Ilo?? odebrana *">
    Koszt wymiany">
    Budgeted Cost ">
    Faktyczny koszt *">
    Numer rachunku ! ! ">
    Uwagi">
    --- 93,134 ---- ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEG????Y RACHUNKU
    Bookfund *
    Quantity Ordered">
    Quantity Received *">
    Replacement Cost">
    Koszta zaplanowane ">
    Faktyczny Koszt*">
    Invoice Number ! ! ">
    Uwagi">
    *************** *** 137,141 ****

     

    !
    --- 137,141 ----

     

    !
    *************** *** 144,162 ****
    		Koszyk ISBNTYTU? AUTORIlo??Otrzymano
    &biblio=&invoice=&freight=&gst=&id=>
    ! --- 144,162 ----     		Koszyk ISBNTYTU?? AUTORQtyReceived
    &biblio=&invoice=&freight=&gst=&id=>
    ! Index: basket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/basket.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** basket.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- basket.tmpl 29 Feb 2004 19:39:51 -0000 1.1.2.1 *************** *** 1,55 **** ! !

    Koszyk dla >


    ! (Our Reference: , #, zatwierdzone przez: )

    ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! --- 1,57 ---- ! !

    Koszyk Zakup??w dla >


    ! Our Reference: , # authorised by

    Zam?wienie IsbnTytu? Autor$ rrp$estIlo??Suma
    &id=&basket=">
    POMOC
    ! W celu zmiany informacji dotycz?cej katalogu lub zaksi?gowania danego zam?wienia nalezy klikn?? w tytu?.
    		 SubTotal
    GST
    TOTAL
    ! "> ! "> ! Dodaj zam?wienie : wprowad? has?o lub tytu?:
    ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! > ! "> ! ! ! *************** *** 59,61 **** ! --- 61,63 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:08 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:08 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui newbasket2.tmpl,1.2,1.2.2.1 newbasket.tmpl,1.1,1.1.2.1 newbiblio.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8103/acqui Modified Files: Tag: rel_2_0 newbasket2.tmpl newbasket.tmpl newbiblio.tmpl Log Message: Index: newbasket2.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket2.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newbasket2.tmpl 4 Oct 2003 19:47:09 -0000 1.2 --- newbasket2.tmpl 29 Feb 2004 19:40:06 -0000 1.2.2.1 *************** *** 1,20 **** ! !

    Koszyk dla:

    ! ! &basket=&sub="> ! Dodaj nowy opis ! ! &basket=&sub="> ! Dodaj nowy opis ! ! "> ! Obejrzyj koszyk
    ! > ! > ! Szukaj od nowa:
    --- 1,20 ---- ! !

    Koszyk Zakup??w dla:

    ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"> ! ! &basket=&sub="> ! //images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"> ! ! "> ! //images/1uparrow.png" border=0 align=right alt="Obejrzyj Koszyk">
    ! > ! > ! New Search:
    *************** *** 23,100 **** Szukano ! ! !
    ! znalezionych trafie?. !
    Trafienia od do wy?wietlone. !
    Order Publisher IsbnTytu?? Autor$ rrp$estQty Total
    &id=&basket=">
    POMOC
    ! To change any of the catalogue or accounting information attached to an order, click on the title.
    		 SubTotal
    GST
    TOTAL
    ! "> ! "> ! Dodaj zam??wienie: wprowad?? has??o lub tytu??:
    "> ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TYTU?AUTOR©ILO??LOKALIZACJA
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! ! ! &type="> ! ! ! ! ! ! ! ! !
    !   ! !   ! !   ! !   ! !   !
    ! ! &offset=&type=&id=&basket=&search=&author="> Dalej !

    ! --- 23,100 ---- Szukano ! ! !
    ! znalezionych rekord??w. !
    Wy??wietlono od do rekordu. ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    TYTU??AUTOR©ILO????LOCATION
    ! ! &author=©right=&id=&basket=&biblio=&title="> ! ! ! ! ©right=&id=&basket=&biblio=&title="> ! ! ! ! ! &type="> ! ! ! ! ! ! ! ! !
    !   ! !   ! !   ! !   ! !   !
    ! ! &offset=&type=&id=&basket=&search=&author="> Dalej ! ! Index: newbasket.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** newbasket.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- newbasket.tmpl 29 Feb 2004 19:40:06 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Koszyk dla


    ! (Our Reference: , #, zatwierdzone przez: )
    ! Tel: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Wyszukaj has?o lub tytu?:
    --- 1,14 ---- ! !

    Koszyk Zakup??w dla


    ! (Our Reference: , #, authorised by: )
    ! Ph: , Fax:
    ! ,
    ! ,

    ! "> ! "> ! Szukaj wg. S??owa Kluczowego lub Tytu??u:
    *************** *** 16,36 **** ! ! ! ! ! > ! ! ! ! ! !
    Zam?wienie IsbnTytu? AutorIlo??
    ! --- 16,36 ---- ! ! ! ! ! > ! ! ! ! ! !
    Order IsbnTytu?? AutorQty
    ! Index: newbiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbiblio.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** newbiblio.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- newbiblio.tmpl 29 Feb 2004 19:40:06 -0000 1.1.2.1 *************** *** 1,3 **** !
    ! ! ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Obejrzyj koszyk !

    - Szczeg??y zam?wienia


    ! Koszyk dla:

    ! ! ! ! ! ! ! ! ! ! ! !
    SZCZEG??Y KATALOGU
    TYTU? *">
    Autor" >
    Data Copyright">
    Format
    ISBN">
    Series">
    Oddzia?
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! --- 51,137 ---- ! ! --> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! ! Przejrzyj Koszyk

    - Szczeg????y Zam??wienia


    ! Shopping Basket For:

    DETALE KSI?GOWO-FINANSOWE
    Ilo??" onchange='update(this.form)' >
    Bookfund
    Cena dostawcy" onchange='update(this.form)'>
    Koszt wymiany
    		" onchange='update(this.form)'>
    Budgeted Cost
    (ex GST, inc discount)     		" onchange='update(this.form)'>
    Budgeted GST
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEG????Y KATALOGU
    Tytu??*">
    Autor" >
    Publisher" >
    Copyright Date">
    Typ pozycji
    ISBN">
    Series">
    Oddzia??
    ! /images/holder.gif" width=32 height=250 align=left> ! ! ! ! ! ! ! ! ! ! ! *************** *** 138,153 **** ! ! ! !
    /images/background-mem.gif" colspan=2>SZCZEG????Y RACHUNKU
    Quantity" onchange='update(this.form)' >
    Bookfund
    Suppliers List Price" onchange='update(this.form)'>
    Replacement Cost
    		" onchange='update(this.form)'>
    Koszta zaplanowane
    (bez VAT, z rabatem)     		" onchange='update(this.form)'>
    Zaplanowany VAT
    Koszt faktyczny
    Numer rachunku *
    Uwagi">
    //images/2rightarrow.png" border=0 align=right>
    --- 141,157 ----
    Faktyczny Koszt
    Invoice Number *
    Uwagi">
    !
    *************** *** 155,166 **** !
    HELP
      !
    • T?uste pola s? obowiazkowe dla stworzenia nowego opisu i pozycji.

      !

    • Zacienione pola mog? by? u?yte w celu "szybkiego" odbioru zam?wienia, gdy pozycje by?y kupione lokalnie lub darowane. W tym wypadku ilo?? "zam?wiona" zostanie wprowadzona do bazy jako ilo?? otrzymana.

     

    ! --- 159,170 ---- !
    /images/background-mem.gif">POMOC
      !
    • T??uste pola musz?? by?? wype??nione, aby utworzy?? nowy opis i egzemplarz.

      !

    • Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.

     

    ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui order.tmpl,1.1,1.1.2.1 recieveorder.tmpl,1.1,1.1.2.1 recieve.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8161/acqui Modified Files: Tag: rel_2_0 order.tmpl recieveorder.tmpl recieve.tmpl Log Message: Index: order.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/order.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** order.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- order.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,18 **** ! !

    Wyniki wyszukiwania dostawc?w


    ! Szukano dostawcy , znaleziono rezultat(y)(?w)

    ! ! ! ! ! > ! !
    Zam?wOdbierzPodmiot ! ! !
    KoszykPozycjePracownikData
    --- 1,18 ---- ! !

    Wyniki Szukania Dostawc??w


    ! You searched on supplier , results found

    ! ! ! ! ! > ! !
    OrderReceiveCompany ! ! !
    KoszykItemsStaffDate
    *************** *** 20,48 ****
    ! /images/mail_send.png" title="Add order" ALT="Add" BORDER=0 > ! /images/mail_get.png" title="receive" ALT="Add" BORDER=0 > ! ! ! ! !
    ">


    ! Dodaj dostawc? ! --- 20,52 ----
    ! ! /images/mail_send.png" title="Dodaj zam??wienie" alt="Dodaj" border=0> ! ! Inactive ! ! /images/mail_get.png" title="receive" alt="Dodaj" border=0> ! ! ! ! !
    ">


    ! Dodaj dostawc?? ! Index: recieveorder.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieveorder.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** recieveorder.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- recieveorder.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,14 **** ! !

    Odbi?r zam?wie? od dostawcy ">

    ! >

    ! ! --- 1,14 ---- ! !

    Przyjmij Zam??wienia od Dostawcy ">

    ! >

    INFORMACJE O RACHUNKU DOSTAWCY
    Numer rachunku dostawcy
    ! ! *************** *** 20,29 **** ! ! --- 20,29 ---- ! ! *************** *** 31,33 **** ! --- 31,33 ---- ! Index: recieve.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieve.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** recieve.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- recieve.tmpl 29 Feb 2004 19:40:23 -0000 1.1.2.1 *************** *** 1,19 **** !
    ! Rachunek:
    ! Otrzymany przez:
    !
    !

    Receipt Summary for : , Rachunek

    ! "> ! "> ! "> ! "> ! Szukaj ISBN lub tytu?:

    --- 1,19 ---- !

    ! Invoice:
    ! Received By:
    !
    !

    Receipt Summary for : Faktura

    ! "> ! "> ! "> ! "> ! Szukaj wg. ISBN lub Tytu??u:

    *************** *** 24,47 ****

    ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ! ! ! ! ! ! ! ! ! ! ! --- 53,60 ---- ! ! ! ! *************** *** 63,74 ****
    The total at the bottom of the page should be within a few cents of the total for the invoice.

    ! When you have finished this invoice save the changes.

    ! !
    SUPPLIER INVOICE INFORMATION
    Supplier Invoice Number
    Za przesy?k?
    /images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
    Freight
    KOSZYK ISBNTYTU? AUTORFAKTYCZNY P&PILSUMA
    &biblio=&invoice=&gst=&freight=&id=">$ $
    --- 24,47 ----     		KOSZYK ISBNTYTU?? AUTORACTUAL P&PQTYTOTAL
    &biblio=&invoice=&gst=&freight=&id=">$ $
    *************** *** 53,60 ****     		SUBTOTALS$$
    SUBTOTALS$$
    GST$
    TOTAL$
    --- 63,74 ----
    The total at the bottom of the page should be within a few cents of the total for the invoice.

    ! Po sko??czeniu faktury zapisz zmiany.

    		GST$
    TOTAL$
    From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:43 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:43 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui supplier.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8230/acqui Modified Files: Tag: rel_2_0 supplier.tmpl Log Message: Index: supplier.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/supplier.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** supplier.tmpl 4 Oct 2003 19:46:28 -0000 1.1 --- supplier.tmpl 29 Feb 2004 19:40:41 -0000 1.1.2.1 *************** *** 1,13 **** !
    ! > ! !

    Uaktualnienie:

    ! !

    Dodaj dostawc?

    !

    --- 1,13 ---- ! ! > ! !

    Update:

    ! !

    Dodaj dostawc??

    !

    *************** *** 15,108 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! - - -
    Szczeg??y podmiotu
    Nazwa podmiotu">
    Adres pocztowy !
    Adres fizyczny
    Telefon">
    Fax">
    Witryna">
    Dane kontaktowe
    Nazwisko">
    Stanowisko">
    Telefon">
    Inny telefon">
    Fax">
    E-mail">
    Uwagi
    /images/filesave.png" border=0 title="save" alt="save">
    ! ! ! ! ! --- 15,109 ----
    BIE??CY STATUS
    Dostawca jestchecked>Active ! checked>Inactive
    DANE O ZAM?WIENIACH
    Publishers and Imprints
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    DANE O FIRMIE
    Company Name">
    Adres Pocztowy !
    Adres Zamieszkania
    Telefon">
    Fax">
    Witryna">
    DANE KONTAKTOWE
    Contact Name">
    Position">
    Telefon">
    Inny Telefon">
    Fax">
    E-mail">
    Uwagi
    ! ! ! ! ! Active Inactive ! ! ! *************** *** 111,117 **** --- 112,118 ---- *************** *** 121,127 **** --- 122,128 ---- *************** *** 130,135 **** --- 131,135 ---- *************** *** 137,142 **** --- 137,141 ---- *************** *** 144,160 **** ! !
    STATUS BIE????CY
    Supplier is ! ! Active Inactive
    ORDERING INFORMATION
    Publishers and Imprints
    GST Registered ! checked>Yes ! checked>No
    GST Registered ! checked>Tak checked>Nie
    List Item Price Includes GST ! checked>Yes ! checked>No
    List Item Price Includes GST ! checked>Tak checked>Nie
    Invoice Item Price Includes GST ! checked>Yes ! checked>No
    Rabat> %
    !

    ! --- 143,159 ----
    		Invoice Item Price Includes GST ! checked>Tak checked>Nie
    Discount> %
    !
    !
    /images/filesave.png" border=0 title="Zapisz" alt="Zapisz" class="button"> ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:40:57 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:40:57 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple addbooks.tmpl,1.3,1.3.2.1 additem-nomarc.tmpl,1.1,1.1.2.1 additem.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8284/acqui.simple Modified Files: Tag: rel_2_0 addbooks.tmpl additem-nomarc.tmpl additem.tmpl Log Message: Index: addbooks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/addbooks.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** addbooks.tmpl 4 Oct 2003 20:45:12 -0000 1.3 --- addbooks.tmpl 29 Feb 2004 19:40:55 -0000 1.3.2.1 *************** *** 1,39 **** ! ! Zarz?dzanie opisem MARC !

    ! Nic nie znaleziono ! !

    ! Dodano opis bibliograficzny witryny !

    !
    Zeskanuj lub wpisz numer ISBN/ISSN, aby doda? nowy opis/pozycj?:

    ! ! ! ! ! ! ! ! ! ! ! ! !
    ISBN:Je?li tytu? lub ISBN zostanie odnaleziony w tablicach opis?w, zostanie przywo?any i b?dzie mo?na go modyfikowa?.
    ! Je?li tytu? lub ISBN zostanie znaleziony w "przechowalni opis?w", zostanie przywo?any a opis zostanie dodany.
    ! W przeciwnym razie opis mo?na utworzy? od podstaw.
    Tytu?
     Utw?rz pusty opis
    Utw?rz pusty opis
    --- 1,39 ---- ! ! Zarz??dzanie Opisem MARC !

    ! No items found ! !

    ! Dodano Witryn?? Biblioitem !

    !
    Zeskanuj lub wpisz numer ISBN/ISSN aby doda?? nowy opis/egzemplarz

    ! ! ! ! ! ! ! ! ! ! ! ! !
    ISBN:Po odnalezieniu i wy??wietleniu numeru ISBN lub tytu??u z bazy opis??w, bedzie mo??na dokona?? modyfikacji.
    ! Je??li ISBN lub tytu?? zostan?? odnalezione w rezerwuarze opis??w to zostanie on wyswietlony i opis zostanie dodany.
    ! W przeciwnym razie, opis mo??na doda?? od podstaw.
    Tytu??
     Wprowad?? od podstaw
    Wprowad?? od podstaw
    *************** *** 44,48 **** !
    Dodaj now? witryn?
    --- 44,48 ---- !
    Dodaj Now?? Witryn??
    *************** *** 50,59 **** ! !
    Has?o:

    ! --- 50,59 ---- ! !
    Keyword:

    ! Index: additem-nomarc.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem-nomarc.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** additem-nomarc.tmpl 5 Oct 2003 19:20:42 -0000 1.1 --- additem-nomarc.tmpl 29 Feb 2004 19:40:55 -0000 1.1.2.1 *************** *** 1,64 **** ! test !

    ! ! Musisz nada? pozycji kod kreskowy

    ! ! ! Musisz otworzy? now? grup?, do kt?rej dodana zostanie pozycja

    ! ! ! Niestety, ten kod jest ju? w u?yciu

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    REKORD BIBLIOGRAFICZNY
    Autor:
    ! Copyright:
    ! Tytu? serii:
    ! Uwagi:
    GRUPA - !
    URL:
    ! Data:
    ! Uwagi:
    ! ! GRUPA -
    ISBN:
    ! Dewey:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    Pozycja:
    ! Odzia? w?asny:
    ! Uwagi:
    --- 1,62 ---- ! test !

    ! ! You must give the item a barcode

    ! ! ! You must create a new group for your item to be ! added to

    ! ! ! Sorry, that barcode is already in use

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    WIERSZ OPISU
    Autor:
    ! Copyright:
    ! Tytu?? Serii:
    ! Uwagi:
    GRUPA -
    URL:
    ! Data:
    ! Uwagi:
    GRUPA -
    ISBN:
    ! Dewey:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    Egzemplarz:
    ! Oddzia?? W??a??ciwy:
    ! Uwagi:
    *************** *** 67,90 ****

    ! "> ! ! ! ! --- 65,88 ---- ! ">
    DODAJ NOW? POZYCJ?:
    ! Dla witryny dodaj tylko grup?
    Kod kreskowy pozycji:
    Oddzia?:
    Cena wymiany:
    ! ! ! ! *************** *** 94,126 **** ! ! ! ! --- 92,123 ---- ! ! ! ! *************** *** 130,150 **** ! ! ! ! ! --- 127,147 ---- ! ! ! ! ! *************** *** 154,158 **** ! --- 151,155 ---- ! *************** *** 171,175 **** ! --- 168,172 ---- ! *************** *** 178,194 **** ! ! ! ! --- 175,191 ---- ! ! ! ! *************** *** 198,203 **** !
    DODAJ NOWY EGZEMPLARZ:
    ! For a website add the group only
    Kod paskowy pozycji:
    Oddzia??:
    Cana Wymiany:
    Dodaj do istniej?cej grupy:
    Grupa:
    LUB dodaj do nowej grupy:
    Format:
    Dodaj do istniej??cej grupy:
    Group:
    LUB Dodaj do nowej Grupy:
    Format:
    Wydawca:
    Rok publikacji:
    Miejsce publikacji:
    Ilustrator:
    Dodatkowi autorzy:
    Ka?dy autor w osobnej linii
    Publisher:
    Publication Year:
    Place of Publication:
    Illustrator:
    Dodatkowi Autorzy:
    One Author per line
    Witryna URL:
    URL Witryny
    LCCN:
    LCCN:
    Numer:
    Volume Description:
    Strony:
    Wymiary:
    Number:
    Opis Tomu:
    Pages:
    Size:
    --- 195,199 ----
    *************** *** 205,207 **** ! --- 201,203 ---- ! Index: additem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** additem.tmpl 4 Oct 2003 20:45:12 -0000 1.2 --- additem.tmpl 29 Feb 2004 19:40:55 -0000 1.2.2.1 *************** *** 1,3 **** ! ! ! ! ! !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 1,129 ---- ! ! ! ! ZAPRASZAMY DO ADMINISTRACJI SYSTEMU ! ! ! ! ! ! ! !
    !
    ! Koha: Horowhenua Library Trust    		 ! !
    !
    ! Wprowad? wyra?enie i naci?nij klawisz enter.
    ! ! ! -Wyszukiwanie zaawansowane (wi?cej opcji)
    !
    !
    ! !
    ! !
    ! Wprowad? wyra?enie i naci?nij kalwisz enter.
    !

    !
    ! ! ! ! --- 7,11 ---- ! *************** *** 13,19 **** --- 13,19 ---- *************** *** 21,60 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! "> ! ">
    /images/koha-front-background.gif">/images/holder.gif" alt="" width="1" height="42" hspace="0" vspace="0" border="0" align="left"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! *************** *** 152,187 **** ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! --- 131,159 ---- ! ! ! ! ! ! ! ! ! + + + + ! ! ! ! *************** *** 190,194 ****
    /images/holder.gif" width="150" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0" >/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="25" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="30" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="20" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="10" height="42" ! alt="" hspace="0" vspace="0">/images/holder.gif" width="90" height="42" ! alt="" hspace="0" vspace="0">
    /images/holder.gif" alt="" width="1" height="1" hspace="0" vspace="0">/images/front-mouseover-search.gif'" onMouseOut="if(document.images)document.search.src='/images/front-search.gif'">/images/front-search.gif" width="320" height="37" name="search" hspace="0" alt="Szukaj w katalogu" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="35" alt="" hspace="0" vspace="0">
    ! /images/koha-front-koha.gif" width="200" height="128" ! alt="Koha: Open Source Library System" hspace="0" vspace="0">    		   ! ! !
    ! Wpisz szukane s??owo i naci??nij klawisz enter.
    ! ! ! /images/front-arrow-purple.gif" width="27" height="22" ! alt="" hspace="0" vspace="0" border="0" align="middle" >Szukanie Zaawansowane (Wi??cej Opcji)
    ! ! /images/holder.gif" width="1" height="8" alt="" hspace="0" vspace="0">
      ! /images/front-mouseover-member.gif'" onMouseOut="if(document.images)document.member.src='/images/front-member.gif'"> ! /images/front-member.gif" width="304" height="37" alt="Wyszukiwanie Czytelnik??w" name="member" hspace="0" vspace="0" border="0">
      
    ! !
    ! Wpisz szukane s??owo i naci??nij klawisz enter.
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
         /images/front-mouseover-acquisitions.gif'" onMouseOut="if(document.images)document.acquisitions.src='/images/front-acquisitions.gif'">/images/front-acquisitions.gif" width="320" height="36" name="acquisitions" alt="Gromadzenie" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >

    !

    !
         /images/front-mouseover-reports.gif'" onMouseOut="if(document.images)document.reports.src='/images/front-reports.gif'">/images/front-reports.gif" width="346" height="37" name="reports" alt="Rachunki i Raporty" hspace="0" vspace="0" border="0">
    ! /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
        /images/front-mouseover-admin.gif'" onMouseOut="if(document.images)document.admin.src='/images/front-admin.gif'">/images/front-admin.gif" width="346" height="37" name="admin" hspace="0" vspace="0" alt="Parametry" border="0">
    + /images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0" >
      /images/front-mouseover-circulation.gif'" onMouseOut="if(document.images)document.circulation.src='/images/front-circulation.gif'">/images/front-circulation.gif" width="346" height="37" name="circulation" alt="Cyrkulacja" hspace="0" vspace="0" border="0">
    - --- 162,165 ---- Index: mancredit.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/mancredit.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** mancredit.tmpl 4 Oct 2003 09:21:00 -0000 1.3 --- mancredit.tmpl 29 Feb 2004 19:46:59 -0000 1.3.2.1 *************** *** 1,22 **** ! !

    Kredyt r?czny

    ! "> ! ! ! ! !
    Numer czytelnika
    Typ
    Numer pozycji
    Opis
    Ilo??
    ! --- 1,22 ---- ! !

    Manual Credit

    ! "> ! ! ! ! !
    Borrowernumber
    Typ
    Itemnumber
    Wyja??nienie
    Kwota
    ! \ No newline at end of file Index: maninvoice.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/maninvoice.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** maninvoice.tmpl 4 Oct 2003 09:21:00 -0000 1.2 --- maninvoice.tmpl 29 Feb 2004 19:46:59 -0000 1.2.2.1 *************** *** 1,25 **** ! !

    Rachunek r?czny

    ! "> ! ! ! !
    Numer czytelnika
    Typ
    Numer pozycji
    Opis
    Kwota
    ! \ No newline at end of file --- 1,25 ---- ! !

    Manual Invoice

    ! "> ! ! ! !
    Borrowernumber
    Typ
    Itemnumber
    Wyja??nienie
    Kwota
    ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:14 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:14 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl member-flags.tmpl,1.1,1.1.2.1 modbibitem.tmpl,1.3,1.3.2.1 modbib.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9875 Modified Files: Tag: rel_2_0 member-flags.tmpl modbibitem.tmpl modbib.tmpl Log Message: Index: member-flags.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/member-flags.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** member-flags.tmpl 4 Oct 2003 09:25:44 -0000 1.1 --- member-flags.tmpl 29 Feb 2004 19:47:11 -0000 1.1.2.1 *************** *** 1,28 **** ! !

    ,

    ! > ! !
    FLAGI
    ! > ! !

    !

    ! --- 1,28 ---- ! !

    ,

    ! > ! !
    FLAGI
    ! > ! !

    !

    ! Index: modbibitem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbibitem.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** modbibitem.tmpl 4 Oct 2003 09:52:36 -0000 1.3 --- modbibitem.tmpl 29 Feb 2004 19:47:11 -0000 1.3.2.1 *************** *** 1,5 **** ! !

    "&type=intra> ()
    ! Modyfikuj Grup? -


    --- 1,5 ---- ! !

    "&type=intra> ()
    ! Modify Group -


    *************** *** 7,11 ****
    PRZYPISZ DO ISTNIEJ?CEJ GRUPY
    RE-ASSIGN TO EXISTING GROUP
    LUB ZMIE? SZCZEG??Y
    Typ pozycji" size=20>
    URL" size="20">
    Klasa" size=20>
    Wydawca" size=20>
    Miejsce" size=20>
    ISBN" size=20>
    Rok publikacji" size=20>
    Strony" size=20>
    Ilustracje" size=20>
    Tom" size=20>
    Notatki">
    Wymiary" size=20>
    --- 21,60 ----
    LUB EDYTUJ SZCZEG????Y
    Typ pozycji" size=20>
    URL" size="20">
    Typ pozycji" size=20>
    Publisher" size=20>
    Place" size=20>
    ISBN" size=20>
    Publication Year" size=20>
    Pages" size=20>
    Illustrations" size=20>
    Tom" size=20>
    Uwagi">
    Size" size=20>
    *************** *** 68,92 ****
    ZMIANY MAJ?CE DOTYCZY? TYCH KOD?W KRESKOWYCH
    ! Zaznacz TE kody kreskowe, kt?rych zmiany maj? dotyczy?. Wszystkie nie-zaznaczone zachowaj? swoj? oryginaln? grup?.
     Kod kreskowyLokalizacjaTermin zwrotuOdprawiono
    ">"&bib=""&bi=""">

    --- 68,92 ---- ! ZMIANY DOTYCZ??CE TYCH KOD??W
    ! Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.   ! Kod Paskowy ! Location ! Date Due ! Ostatnio rejestrowana ! ! "> ! &bib=&bi="> ! ! !

    *************** *** 99,106 **** ! POMOC: Musisz klikn?? w ??dane k??ko wyboru (na zielonym tle), nast?pnie albo przypisa? pozycj?/e do istniej?cego ju? w systemie rekordu, ! albo zmodyfikowa? ten rekord. JE?LI zmiany maj? dotyczy? jedynie niekt?rych pozycji, zaznacz je odpowiednio, w?wczas utworzony zostanie dla nich automatycznie osobny rekord grupowy.

     

    ! --- 99,105 ---- ! HELP Nale??y klikn???? na odpowiedni guzik (w zielonym prostok??cie) i wybra?? albo przypisanie do istniej??cej grupy albo modyfikacj?? rekordu. Je??li zmiany maj?? dotyczy?? tylko niekt??rych rekord??w, nale??y zaznaczy?? je odpowiednio; stworzy to automatycznie nowy grupowy rekord.

     

    ! Index: modbib.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modbib.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** modbib.tmpl 4 Oct 2003 09:34:15 -0000 1.2 --- modbib.tmpl 29 Feb 2004 19:47:11 -0000 1.2.2.1 *************** *** 1,57 **** ! ! ">Zmie? dowi?zania stron ! "> ! "> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Autor">
    Tytu?">
    Abstrakt
    Przedmiot
    Data Copyright'u">
    Tytu? Serii">
    Autor dodatkowy">
    Podtytu?">
    Ujednolicony">
    Notatki
    Seria">

    ! ! --- 61,63 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:28 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:28 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl moditem.tmpl,1.4,1.4.2.1 modwebsites.tmpl,1.2,1.2.2.1 newimember.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9918 Modified Files: Tag: rel_2_0 moditem.tmpl modwebsites.tmpl newimember.tmpl Log Message: Index: moditem.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/moditem.tmpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -r1.4 -r1.4.2.1 *** moditem.tmpl 4 Oct 2003 09:59:49 -0000 1.4 --- moditem.tmpl 29 Feb 2004 19:47:26 -0000 1.4.2.1 *************** *** 1,42 **** ! !

    ()


    --- 1,36 ---- ! !

    ()


    ! ! "> ! "> ! "> ! "> ! "> ! "> ! ! "> ! ! ! ! ! "> ! "> ! ">
    Kod kreskowy" size=40>
    Uwagi o pozycji
    Oddzia? w?a?ciwy" size=40>
    Zagubiona ! checked > ! Yes ! checked > ! No
    Cancelled checked > ! Yes ! checked > ! No
    ! //images/filesave.png border=0>
    *************** *** 44,46 **** ! \ No newline at end of file --- 38,40 ---- ! Index: modwebsites.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/modwebsites.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** modwebsites.tmpl 4 Oct 2003 10:03:03 -0000 1.2 --- modwebsites.tmpl 29 Feb 2004 19:47:26 -0000 1.2.2.1 *************** *** 1,41 **** !

    ! ">Powr?t do strony szczeg???w !

    ! "> ! ">

    ! ! "> ! "> ! "> ! "> ! "> ! "> ! ! "> ! ! ! ! ! "> ! "> ! ">
    Kod Paskowy" size=40>
    ItemNotes
    Oddzia?? W??a??ciwy" size=40>
    Lost ! checked > Yes checked > No
    Anulowano checked > Yes checked > No
    ! //images/filesave.png border=0>
    ! ! ! ! !
    Tytu?">
    Opis
    URL">
    ! !

    !

    Dodaj nast?pn? stron? www

    ! "> ! ! --- 1,41 ---- !

    ! ">Return to Details Page !

    ! "> ! ">

    Tytu?
    Opis
    ! ! ! ! !
    Tytu??">
    Wyja??nienie
    URL">
    !
    !

    !

    Dodaj nowy link witryny

    ! "> ! ! *************** *** 45,51 ****
    Tytu??
    Wyja??nienie
    !
    ! --- 45,51 ---- ! ! Index: newimember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newimember.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** newimember.tmpl 4 Oct 2003 10:07:48 -0000 1.3 --- newimember.tmpl 29 Feb 2004 19:47:26 -0000 1.3.2.1 *************** *** 1,19 **** ! ! ! ! ! ! Niewa?ny numer karty.

    ! ! Warto?ci zgodne. Kliknij OK, by potwierdzi? nowego czytelnika

    ! ! " value=""> !
    !     !     ! --- 1,180 ---- ! ! ! ! ! ! Invalid cardnumber.

    ! !

    Potwierd?? Wpis

    ! ! " > ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! " > ! ! ! ! ! ! !
    /images/background-mem.gif"> ! NOWY CZYTELNIK !
    ! Imi?? i Nazwisko ! ! !
    /images/background-mem.gif"> ! DANE CZ??ONKOWSKIE !
    ! Numer Cz??onkowski ! ! !
    ! Numer karty ! ! !
    ! Oddzia?? Zapisu ! ! !
    /images/background-mem.gif"> ! ADRES CZYTELNIKA !
    ! Adres Pocztowy ! ! !
    ! Adres Domowy ! ! !
    /images/background-mem.gif"> ! SZCZEG????Y DANYCH KONTAKTOWYCH !
    ! Telefon (Dom) ! ! !
    ! Telefon (Praca) ! ! !
    ! Fax ! ! !
    ! E-mail ! ! !
    ! Komunikatory ! ! !
    /images/background-mem.gif"> ! PO??REDNI RODZAJ KONTAKTU !
    ! Imi?? i Nazwisko ! ! !
    ! Telefon ! ! !
    ! Relacja ! ! !
    ! Uwagi ! ! !
    /images/background-mem.gif"> ! UWAGI !
    ! Uwagi Og??lne ! ! !

    ! Prawid??owe warto??ci. Naci??nij OK by potwierdzi?? tego nowego czytelnika

    ! ! " value=""> !
    ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:55 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:55 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl overdue.tmpl,1.2,1.2.2.1 reports.tmpl,1.1,1.1.2.1 request.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9986 Modified Files: Tag: rel_2_0 overdue.tmpl reports.tmpl request.tmpl Log Message: Index: overdue.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/overdue.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** overdue.tmpl 4 Oct 2003 12:58:40 -0000 1.2 --- overdue.tmpl 29 Feb 2004 19:47:52 -0000 1.2.2.1 *************** *** 1,32 **** ! !

    Pozycje zaleg?e w dniu


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Termin zwrotuKlientTel.Tytu? Autor
    ?subject=Overdue: ">
    ! --- 1,32 ---- ! !

    Zaleg??e pozycje do dnia


    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Do ZwrotuPatronTelefonTytu?? Autor
    ?subject=Overdue: ">
    ! Index: reports.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** reports.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- reports.tmpl 29 Feb 2004 19:47:52 -0000 1.1.2.1 *************** *** 1,8 **** ! !

    raporty

    ! ! ! ! --- 1,8 ---- ! !

    report??w

    ! ! ! ! Index: request.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/request.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** request.tmpl 4 Oct 2003 12:53:07 -0000 1.1 --- request.tmpl 29 Feb 2004 19:47:52 -0000 1.1.2.1 *************** *** 1,12 **** !
    ! /images/place-request.gif" align=right > ! "> ! "> !

    Zamawienie: ! > !

    --- 1,9 ---- ! ! "> ! "> !

    Zam??wienie: >

    *************** *** 14,23 **** ! ! ! ! ! ! --- 11,20 ----
    /images/background-mem.gif">Ranga/images/background-mem.gif">Numer Cz?onka/images/background-mem.gif">Uwagi/images/background-mem.gif">Data/images/background-mem.gif">Odbi?r/images/background-mem.gif">Zam?wienie
    ! ! ! ! ! ! *************** *** 25,85 **** ! !
    /images/background-mem.gif">Rank/images/background-mem.gif">Member Number/images/background-mem.gif">Uwagi/images/background-mem.gif">Date/images/background-mem.gif">Pickup/images/background-mem.gif">Request
    ! Kolejna dost?pna,
    (lub wybierz z listy poni?ej)
    ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Zam?wienie/images/background-mem.gif">Typ pozycji/images/background-mem.gif">Klasyfikacja/images/background-mem.gif">Tom/images/background-mem.gif">Data publikacji/images/background-mem.gif">Egzemplarze
    ! ! Nie mo?e by? wybrana ! ! > ! > ! ! ! ! ! ! !
    !
    --- 22,82 ---- ! ! ! Next Available, or choose from list below ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Request/images/background-mem.gif">Typ pozycji/images/background-mem.gif">Classification/images/background-mem.gif">Tom/images/background-mem.gif">Pubdate/images/background-mem.gif">Copies
    ! ! Cannot be selected ! ! > ! > ! ! ! ! ! ! !
    !
    *************** *** 89,161 **** ! action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODYFIKUJ ISTNIEJ?CE ZAM?WIENIA
    /images/background-mem.gif">Ranga/images/background-mem.gif">Cz?onek/images/background-mem.gif">Uwagi/images/background-mem.gif">Data/images/background-mem.gif">Odbi?r/images/background-mem.gif">Zam?wienie
    ! > ! > ! > ! Oczekuj?ca pozycja w > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Kolejna dost?pna ! ! ! Tylko ten typ : ! ! !
    ! Wyma? rezerwacj? wybieraj?c "del" z listy ranga. ! //images/2rightarrow.png">
    --- 86,159 ---- ! action=modrequest.pl method=post> ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif" colspan=7>MODIFY EXISTING REQUESTS
    /images/background-mem.gif">Rank/images/background-mem.gif">Member/images/background-mem.gif">Uwagi/images/background-mem.gif">Date/images/background-mem.gif">Pickup/images/background-mem.gif">Request
    ! > ! > ! > ! Item waiting at > ! ! ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"> ! ! ! ! Next Available ! ! ! This type only : ! ! !
    ! Delete a request by selecting "del" from the rank list. ! //images/2rightarrow.png"> !
    *************** *** 164,166 ****

    ! --- 162,164 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:47:42 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:47:42 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl newjmember.tmpl,1.2,1.2.2.1 newmember.tmpl,1.2,1.2.2.1 opac-main.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9954 Modified Files: Tag: rel_2_0 newjmember.tmpl newmember.tmpl opac-main.tmpl Log Message: Index: newjmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newjmember.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newjmember.tmpl 4 Oct 2003 10:10:43 -0000 1.2 --- newjmember.tmpl 29 Feb 2004 19:47:40 -0000 1.2.2.1 *************** *** 1,13 **** ! ! ! ! !

    'Potwierd? Wpis'

    ! ! ! " > ! --- 1,13 ---- ! ! ! ! !

    Potwierd?? Wpis

    ! !
    "> NOWY CZYTELNIK
    ! " > ! *************** *** 18,30 **** ! " > ! ! " > ! --- 34,41 ---- *************** *** 45,85 ****
    "> NOWY CZYTELNIK
    ! NAZWISKO !
    "> ! SZCZEG??Y CZ?ONKOWSKIE --- 18,30 ----
    ! Imi?? i Nazwisko !
    "> ! DANE CZ??ONKOWSKIE *************** *** 34,41 ****
    ! Numer Czytelnika !
    ! Numer Cz??onkowski !
    !
    ! P?e? !
    ! Szko?a !
    ! Uwagi og?lne !

    ! !

    ! ! " value=""> ! !
    !     ! --- 45,85 ---- ! ! P??e?? ! ! Szko??a ! ! Uwagi Og??lne !

    ! !

    ! ! " value=""> ! !
    ! ! Index: newmember.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/newmember.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** newmember.tmpl 4 Oct 2003 12:58:40 -0000 1.2 --- newmember.tmpl 29 Feb 2004 19:47:40 -0000 1.2.2.1 *************** *** 1,55 **** ! ! !

    Potwierd? Wpis

    ! " > ! ! " > ! --- 1,55 ---- ! ! !

    Potwierd?? Wpis

    /images/background-mem.gif"> ! NOWY CZ?ONEK
    ! Nazwisko !
    /images/background-mem.gif"> ! SZCZEG??Y CZ?ONKOWSKIE
    ! Numer czytelnika !
    ! Numer Karty !
    ! Kategoria cz?onkowstwa !
    ! Op?ata !
    ! " > ! ! " > ! *************** *** 59,84 **** ! " > ! --- 59,84 ---- ! " > ! *************** *** 88,104 **** ! " > ! --- 88,108 ---- ! " > ! *************** *** 106,142 **** ! " > ! --- 110,146 ---- ! " > ! *************** *** 146,150 **** --- 150,154 ---- *************** *** 154,195 **** ! " > ! --- 158,199 ---- ! " > ! *************** *** 199,251 **** ! " > !
    /images/background-mem.gif"> ! NOWY CZYTELNIK
    ! Imi?? i Nazwisko !
    /images/background-mem.gif"> ! DANE CZ??ONKOWSKIE
    ! Numer Cz??onkowski !
    ! Numer karty !
    ! Kategoria Cz??onkowska !
    ! Op??ata !
    !
    ! Termin wyga?ni?cia !
    ! Oddzia? zapisu !
    /images/background-mem.gif"> ! DANE PERSONALNE
    !
    ! Data wyga??ni??cia !
    ! Oddzia?? Zapisu !
    /images/background-mem.gif"> ! DANE OSOBISTE
    !
    ! P?e? !
    /images/background-mem.gif"> ADRES CZYTELNIKA !
    ! P??e?? ! ! M????czyzna ! ! Kobieta !
    /images/background-mem.gif"> ADRES CZYTELNIKA
    ! Adres pocztowy !
    ! Adres domowy !
    /images/background-mem.gif"> ! DANE OSOBY KONTAKTOWEJ
    ! Tel. (Domowy) !
    ! Tel. (W pracy) !
    ! Adres Pocztowy !
    ! Adres Domowy !
    /images/background-mem.gif"> ! SZCZEG????Y DANYCH KONTAKTOWYCH
    ! Tel. domowy !
    ! Tel. praca !
    !
    !
    !
    ! Text messaging !
    /images/background-mem.gif"> ! ALTERNATYWNE DANE OSOBY KONTAKTOWEJ
    ! Nazwisko !
    ! Tel. !
    ! Pokrewie?stwo !
    !
    ! Komunikatory !
    /images/background-mem.gif"> ! PO??REDNI RODZAJ KONTAKTU
    ! Imi?? i Nazwisko !
    ! Telefon !
    ! Relacja !
    !
    /images/background-mem.gif"> ! NOTATKI
    ! Uwagi og?lne !

    ! ! " value=""> ! !
    ! !

    B??D

    !

    Nast?puj?ce pola s? ?le wype?nione. Wr?? do poprzedniej strony i spr?buj raz jeszcze:

    ! ! Cardnumber
    !     ! ! Invalid_cardnumber
    !     ! ! Gender
    !     ! ! Given Names
    !     ! ! Surname
    !     ! ! Postal Street Address
    !     ! ! Postal city
    !     !     ! --- 203,255 ---- ! ! " > ! /images/background-mem.gif"> ! UWAGI ! Uwagi Og??lne !

    ! ! " value=""> ! !
    ! !

    B????D

    !

    Nast??puj??ce pola maj?? niew??a??ciwe warto??ci. Nacisnij przycisk wstecz i popraw:

    ! ! Numer karty
    ! ! ! Nie prawid??owy numer karty
    ! ! ! P??e??
    ! ! ! Imiona
    ! ! ! Nazwisko
    ! ! ! Ulica Adresu Pocztowego
    ! ! ! Miasto
    ! ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** opac-main.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- opac-main.tmpl 29 Feb 2004 19:47:40 -0000 1.3.2.1 *************** *** 1,269 **** ! ! ! WITAMY W KATALOGU KOHA ! ! ! - - - - - - -
    - ! ! ! ! ! - -
    ! ! ! ! ! ! ! ! ! ! ! ! ! - - - - ! ! ! ! - - - - - - - - - - - - - - -

    - Koha: Katalog i us?ugi dla czytelnik?w    		Szukaj w katalogu
       
    - -
    - ! ! Wprowad? wyra?enie i naci?nij klawisz enter.
    ! - - -Wyszukiwanie zaawansowane (wi?cej opcji)
    ! ! -

    ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! ! ! !

    Zaloguj si? do Koha

    ! ! !
    - -
    -

    -

    - --- 1,134 ---- ! ZAPRASZAMY DO KATALOGU OPAC
    ! !
    ! ! ! ! ! !

    Koha: Horowhenua Library Trust Catalogue and Member Services    		 Search the Catalogue
       

    ! Wpisz szukane s??owo i naci??nij klawisz enter.
    -Szukanie Zaawansowane (Wi??cej Opcji)

    ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Log In to Koha

    !

    From kb2qzv at users.sourceforge.net Sun Feb 29 20:48:07 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:48:07 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl reservereport.tmpl,1.1,1.1.2.1 searchheader.tmpl,1.1,1.1.2.1 shelves.tmpl,1.1,1.1.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10067 Modified Files: Tag: rel_2_0 reservereport.tmpl searchheader.tmpl shelves.tmpl Log Message: Index: reservereport.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reservereport.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** reservereport.tmpl 9 Jan 2003 10:08:16 -0000 1.1 --- reservereport.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,25 **** !
    ! ! --- 1,25 ---- !
    ! ! ! !
    !     
    ! ! *************** *** 27,29 ****
    ! ! ! !
    !     
    ! --- 27,29 ---- ! Index: searchheader.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/searchheader.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** searchheader.tmpl 9 Jan 2003 10:08:17 -0000 1.1 --- searchheader.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,2 **** ! >Results with dewey | >Results with biblionumber
    --- 1,2 ---- ! >Results with dewey | >Results with biblionumber
    Index: shelves.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/shelves.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** shelves.tmpl 9 Jan 2003 10:08:17 -0000 1.1 --- shelves.tmpl 29 Feb 2004 19:48:05 -0000 1.1.2.1 *************** *** 1,102 **** ! !

    Zalogowano jako: [Wyloguj]

    ! ! ! !
    !
    ! Lista p??ek

    ! ! ! ! ! ! ! ! ! ! ! !
    ! ! !
    Dodaj ksi??k? wed?ug kodu kreskowego:
    !
    ! ! !
    "> ! Zawarto?? p??ki shelf !
    !
    ">">" width=10 align=center>">" width=10 align=center>">" width=10 align=center>">
    !
    ! "> ! ! "> ! !

    ! ! ! !

    ! ! ! !

    ! !

    ! Modyfikuj zawarto?? p??ki

    !

    P??ki z ksi??kami

    !
    !
    ! ! ! ! ! ! ! ! !
    "> ! Wybierz p??ki do wymazania !
    "> ! "> ! ( books) !
    !

    !

    		! ! !

    Dodaj p??k?:

    !

    ! !

    !
    ! ! ! !
    "> ! ! !
    "> ! Lista p??ek !
    !
    "> ! "> ! ( ksi??ki) !
    !

    Dodaj lub usu? p??ki ! ! ! ! ! --- 1,139 ---- ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Contents of !
    ">">">">">
    !
    ! Shelf list ! "> ! ! "> ! !
    !
    ! "> ! ! "> ! ! ! ! ! !
    ! Dodaj ksi????k?? wg. kodu paskowego w ! ! ! ! "> ! !
    !
    ! ! ! !

    ! ! ! !

    ! !

    !

    P????ki

    ! ! ! ! ! !
    !
    !

    ! Shelf list !

    !
    !     		!
    ! ! ! ! ! ! ! ! ! ! !
    "> ! Select Shelves to Delete !
    "> ! "> ! ( ksi????ek) !
    !

    !

    !

    !     		!
    ! ! ! ! ! ! ! ! !
    "> ! Dodaj P????k?? !
    !

    !
    !

    !
    !
    !
    ! ! ! ! ! ! ! !
    "> ! ! ! ! !
    "> ! Shelf List !
    !
    "> ! "> ! ( ksi??zek) !
    !

    ! Dodaj lub Usu?? P????ki Wirtualne !

    ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:48:20 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:48:20 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl stats.tmpl,1.1,1.1.2.1 thesaurus_popup.tmpl,1.3,1.3.2.1 updatebiblio.tmpl,1.3,1.3.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10118 Modified Files: Tag: rel_2_0 stats.tmpl thesaurus_popup.tmpl updatebiblio.tmpl Log Message: Index: stats.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/stats.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** stats.tmpl 4 Oct 2003 12:53:07 -0000 1.1 --- stats.tmpl 29 Feb 2004 19:48:17 -0000 1.1.2.1 *************** *** 1,22 **** !
    ! ! ! ! ! ! ! ! ! !
    Nazwa TypData/czas KwotaOdzia?
    --- 1,22 ---- !
    ! ! ! ! ! ! ! ! ! !
    Imi?? i Nazwisko TypDate/time KwotaOddzia??
    *************** *** 24,33 ****

    ! Zap?acono w sumie:
    ! Odpisano w sumie:

    ! --- 24,33 ----

    ! Wp??acono w sumie:
    ! Odpisano w sumie:

    ! Index: thesaurus_popup.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/thesaurus_popup.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** thesaurus_popup.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- thesaurus_popup.tmpl 29 Feb 2004 19:48:17 -0000 1.3.2.1 *************** *** 1,43 **** ! Kreator warto?ci Tezaurusa dla kategorii <TMPL_VAR name="category"> !
    !
    !

    ! "> ! "> ! "> !

    !
    ! ! "> ! "> ! "> ! !
    ! "> ! "> ! wprowad? now? authority : !
    ! --- 1,45 ---- ! Tworzenie warto??ci tezaurusa dla kategorii <!-- TMPL_VAR name="category" -->
    !
    !

    ! "> ! "> ! "> ! "> !

    !
    ! ! "> ! "> ! "> ! "> !
    !
    ! "> ! "> ! "> ! insert a new authority : !
    ! Index: updatebiblio.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/updatebiblio.tmpl,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -r1.3 -r1.3.2.1 *** updatebiblio.tmpl 4 Oct 2003 12:58:40 -0000 1.3 --- updatebiblio.tmpl 29 Feb 2004 19:48:17 -0000 1.3.2.1 *************** *** 1,14 **** ! ! !

    Kliknij "Prze?lij..", by wymusi? przedmiot

    ! ! " value=""> ! ! ">
    --- 1,14 ---- ! ! !

    Click submit to force the subject
    ! ! " value=""> ! ! ">
    *************** *** 16,18 **** ! --- 16,18 ---- ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:50:56 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:50:56 -0800 Subject: [Koha-cvs] CVS: koha/misc/translator default_opac_pl_PL.po,1.3,1.4 Message-ID: Update of /cvsroot/koha/koha/misc/translator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10624 Modified Files: default_opac_pl_PL.po Log Message: minor updates Index: default_opac_pl_PL.po =================================================================== RCS file: /cvsroot/koha/koha/misc/translator/default_opac_pl_PL.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** default_opac_pl_PL.po 28 Feb 2004 15:18:42 -0000 1.3 --- default_opac_pl_PL.po 29 Feb 2004 19:50:53 -0000 1.4 *************** *** 8,12 **** "Project-Id-Version: default_opac_pl_PL\n" "POT-Creation-Date: 2004-02-28 14:09+0100\n" ! "PO-Revision-Date: 2004-02-28 14:26+0100\n" "Last-Translator: Benedict P. Barszcz \n" "Language-Team: Polish \n" --- 8,12 ---- "Project-Id-Version: default_opac_pl_PL\n" "POT-Creation-Date: 2004-02-28 14:09+0100\n" ! "PO-Revision-Date: 2004-02-29 20:34+0100\n" "Last-Translator: Benedict P. Barszcz \n" "Language-Team: Polish \n" *************** *** 485,489 **** #: /home/kb2qzv/CVS-Cervisia/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 ! #,fuzzy msgid "Current Loan" msgstr "Bie????ce wypo??yczenie" --- 485,489 ---- #: /home/kb2qzv/CVS-Cervisia/koha/koha-tmpl/opac-tmpl/default/en/opac-user.tmpl:98 ! msgid "Current Loan" msgstr "Bie????ce wypo??yczenie" From kb2qzv at users.sourceforge.net Wed Feb 25 23:30:48 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Wed, 25 Feb 2004 14:30:48 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/default/pl opac-detail.tmpl,1.4.2.1,1.4.2.2 opac-main.tmpl,1.4.2.1,1.4.2.2 opac-moredetail.tmpl,1.4.2.1,1.4.2.2 opac-reserve.tmpl,1.4.2.1,1.4.2.2 opac-searchresults.tmpl,1.2.2.1,1.2.2.2 opac-search.tmpl,1.3.2.1,1.3.2.2 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20449/koha-tmpl/opac-tmpl/default/pl Modified Files: Tag: rel_2_0 opac-detail.tmpl opac-main.tmpl opac-moredetail.tmpl opac-reserve.tmpl opac-searchresults.tmpl opac-search.tmpl Log Message: New, fresh translation by way of xgettext.pl Index: opac-detail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-detail.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** opac-detail.tmpl 22 Feb 2004 17:08:04 -0000 1.4.2.1 --- opac-detail.tmpl 25 Feb 2004 22:30:45 -0000 1.4.2.2 *************** *** 2,6 **** !

    ">Zam??w

    --- 2,6 ---- !

    ">Zarezerwuj

    *************** *** 13,17 **** ! ( record ) --- 13,17 ---- ! ( record ) *************** *** 19,41 **** ! ISBN:">
    ! Subtitle:
    ! Autor: ">
    ! Additional Autor:
    Published by : ! in , ,
    ! Collection:
    ! Przedmiot:
    ! Year :
    ! Notes:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Total Number z Items:     --- 19,49 ---- ! ISBN: ">
    ! Podtytu??:
    ! Autor: ">
    ! Dodatkowy Autor:
    Published by : ! w , ,
    ! Kolekcja:
    ! ! ! ! Przedmiot(y): ! : "> !
    ! ! ! ! Rok :
    ! Uwagi:
    ! Unititle:
    ! Serial:
    ! Dewey: ">
    ! Classification:
    ! LCCN:
    ! URL: ">
    ! Pozycji Razem:     *************** *** 45,51 **** ! ! ! --- 53,59 ----
    Typ pozycjiLokalizacjaDate Due Last Seen Kod paskowy
    ! ! ! *************** *** 63,69 **** ! ! --- 71,77 ---- ! ! Index: opac-main.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/default/pl/opac-main.tmpl,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** opac-main.tmpl 22 Feb 2004 17:07:51 -0000 1.4.2.1 --- opac-main.tmpl 25 Feb 2004 22:30:45 -0000 1.4.2.2 *************** *** 3,7 **** ! WELCOME TO THE KOHA OPAC !
    Typ PozycjiMiejsceDo Zwrotu Last Seen Kod paskowy
    Website OnlineAvailable  
    Witryna OnlineDost??pna  
    ! ! /images/background-mem.gif"> ! *************** *** 54,67 ****
    !
    ! ! ! !
    ">//images/fileopen.png">">NormalOpis MARC :
    --- 8,25 ---- ! --- 27,55 ---- !
    ! ! /images/background-mem.gif"> ! !
    ! ! ! ! ! ! !
    ">//images/fileopen.png">//images/edittrash.png">">Zwyk??e')">Drukuj')">Dodaj na p????k??Opis MARC :
    *************** *** 24,52 ****
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Pozycja
    !
    		! ! ! class="button">Zam?w !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    0
    1
    2
    3
    4
    5
    6
    7
    8
    9
    Item
    !
    		! ! ! " class="button">Request !
    ! ! /images/background-mem.gif"> ! ! ! ! ! --- 57,70 ----
    !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! *************** *** 71,240 ****
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! ! /images/background-mem.gif"> ! ! ! ! ! ! !
     &operator==&type=intranet&value=">//images/filefind.png" height=15>
    ! Index: moredetail.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/moredetail.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** moredetail.tmpl 9 Jan 2003 11:35:10 -0000 1.1 --- moredetail.tmpl 29 Feb 2004 19:41:43 -0000 1.1.2.1 *************** *** 1,53 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj si? do Koha

    !

    ! ! ! ! &type=intra> ! ()

    ! > ! > ! ! --- 1,48 ---- !

    ! !
    GRUPA -
    ! !
    ! Numer opisu:
    ! Typ pozycji:
    ! URL:
    ! Okres wypo?yczenia:
    ! Op?ata za wypo?yczenie:
    ! Classification:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilus:
    ! Wymiary:
    ! Notatki:
    ! W sumie pozycji:
    ! ! ! !
    ! >Requests !
    !

    &type=intra> ()

    ! > ! > ! ! *************** *** 55,99 ****
    /images/background-mem.gif" ! > GRUPA -
    ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Numeropisu:
    ! Typ pozycji:
    ! URL:
    ! Okres wypo??yczenia:
    ! Op??ata wynajmu:
    ! Klasyfikacja:
    ! ISBN:
    ! Wydawca:
    ! Miejsce:
    ! Data:
    ! Tom:
    ! Strony:
    ! Ilus:
    ! Rozmiar:
    ! Uwagi:
    ! Liczba Egzemplarzy:
    ! ! ! !
    KOD KRESKOWY !
    ! > ! > ! > ! !
    ! Odzia? w?a?ciwy:
    ! Oddano?:
    ! Wypo?yczono?:
    ! Ostatni czytelnik 1:
    ! Ostatni czytelnik 2:
    ! Bie??cy oddzia?:
    ! Cena wymiany:
    ! Pozycja zagubiona:
    ! Zap?acono dla:
    ! Uwagi:
    ! Wznowienia:
    ! &biblio=&invoice=&catview=yes"> ! Accession ! Data:
    ! Anulowano:
    &bi=&itm=> ! W sumie wypo?ycze?:
    ! Numer grupy:
    ! Numer opisu:
    --- 50,90 ----
    ! ! ! /images/holder.gif" width=16 height=300 align=left> !
    /images/background-mem.gif">BARCODE
    ! > ! > ! > ! //images/fileopen.png"> ! //images/edittrash.png">
    ! Oddzia?? W??a??ciwy:
    ! Ostatnio rejestrowana:
    ! Ostatnio pozyczono:
    ! ! ! Ostatni Czytelnik 1:
    ! Ostatni Czytelnik 2:
    ! Obecny Oddzia??:
    ! Cena Wymiany:
    ! Egzemplarz zgubiony:
    ! Op??acono przez:
    ! Uwagi:
    ! Przed??u??enia:
    ! &biblio=&invoice=&catview=yes"> Nabyto dnia:
    ! Anulowano:
    &bi=&itm=>Wypo??ycze?? w sumie:
    ! Numer Grupy:
    ! Numer Opisu:
    *************** *** 104,108 ****
    !

    --- 95,99 ----

    !

    *************** *** 110,112 ****

    ! --- 101,103 ----
    ! Index: searchresults.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/searchresults.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** searchresults.tmpl 27 Oct 2003 15:41:28 -0000 1.2 --- searchresults.tmpl 29 Feb 2004 19:41:43 -0000 1.2.2.1 *************** *** 1,83 **** ! ! ! ! !
    ! ! Szuka?e? ! ! Nie poda?e? kryteri?w wyszukiwania
    !     ! znalezionych trafie?

    ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> !

    ! ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> --- 1,87 ---- ! ! ! ! !
    ! ! You searched on ! ! You did not specify any seach criteria
    ! ! znalezionych rekord??w

    ! ! &=&type=opacintra>/images/numbers/prev.gif border=0> ! ! /images/numbers/placeholder.gif border=0> ! ! ! ! /images/numbers/-highlight.gif> ! ! &=&type=opacintra>/images/numbers/.gif border=0> ! ! ! ! &=&type=opacintra>/images/numbers/next.gif border=0> ! ! /images/numbers/placeholder.gif border=0> !

    !

    Tytu?Autor©Ilo??Lokalizacja 
    ?type=opacintra&bib=>&type=opacintra> >Request
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! &=&type=opacintra>Next Records ! !   !
    ! bgcolor=#99cccc background=/images/background-opac.gif background="/images/background-mem.gif"> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> *************** *** 85,101 ****
    ! Wyniki do z trafie?.
    ! Jeszcze jedno wyszukiwanie ! ! Jeszcze jedno wyszukiwanie ! ! ! ! ! ! --- 89,105 ----
    ! Wy??wietlono od do z rekord??w.
    ! Spr??buj innej kwerendy ! ! Spr??buj innej kwerendy ! ! ! ! ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:41:59 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:41:59 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/circ branchtransfers.tmpl,1.1,1.1.2.1 circulation.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8601/circ Modified Files: Tag: rel_2_0 branchtransfers.tmpl circulation.tmpl Log Message: Index: branchtransfers.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/branchtransfers.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** branchtransfers.tmpl 26 Oct 2003 23:39:41 -0000 1.1 --- branchtransfers.tmpl 29 Feb 2004 19:41:57 -0000 1.1.2.1 *************** *** 1,77 **** !
    Tytu??Autor©Item CountLocation 
    ?type=opacintra&bib=>&type=opacintra> >RequestNot Reservable
    ! ! bgcolor=#99cccc background=/images/background-opac.gifbgcolor=#ccccff background="/images/background-mem.gif"> !
    ! ! &=&type=opacintra>Previous Records ! !   ! ! ! &=&type=opacintra>Next Records ! !   !
    ! ! Nast?pny Czytelnik ! ! Zwroty
    !

    Wypo?yczalnia: Transfery


    ! Oddzia?:   ! Drukarka:
    ! Zmie? ustawienia ! > ! >

    ! ! ! > ! > !

    ! ! !

    /images/background-mem.gif">Wykryto rezerwacj?
    ! Zarezerwowano: wykryto rezerwacj? dla (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Pozycja oznaczona czeka:
    ! Pozycja jest oznaczona i czeka w dla (" onClick="openWindow(this,'Member', 480, 640); return false;">).
     ! ! ! > ! > !

    ! !

    ! Ustaw rezerwacj? jako czekaj?c? i transferuj ksi??ke do : ! Uniewa?nij rezerwacj?, nast?pnie spr?buj transferowa?:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Uniewa?nij rezerwacj?, nast?pnie spr?buj transferowa?:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignoruj i powr?? do transfer?w:
    ! > ! ! value=> ! value=> ! value=> !
    --- 1,73 ---- !
    ! Next Borrower Returns
    !

    Cyrkulacja: Transfery


    ! Oddzia??:   Drukarka:
    ! Zmie?? Ustawienia ! > ! >

    ! !
    /images/background-mem.gif">Znaleziono Rezerwacj??
    ! Reserved: reserve found for (" onClick="openWindow(this,'Member', 480, 640); return false;">). ! Oznaczona jako Oczekuj??ca
    ! Item is marked waiting at for (" onClick="openWindow(this,'Member', 480, 640); return false;">).
    ! !
    ! Set reserve to waiting and transfer book to : ! Anuluj rezerwacj?? a nast??pnie spr??buj transferu:
    ! ! value=> ! value=> ! value=> ! ! > ! > ! > ! ! ! !
    Anuluj rezerwacj?? a nast??pnie spr??buj transferu:
    ! ! value=> ! value=> ! value=> ! ! ! > ! > ! > ! > !
    !
    Ignore and return to transfers:
    ! > ! ! value=> ! value=> ! value=> !
    *************** *** 80,162 ****
    ! !
    /images/background-mem.gif">Wiadomo?ci
    ! ! ! Rezerwacja uniewa?niona
    !     ! ! Pozycja powinna teraz czeka? w oddziale:
    !     !     ! ! ! Brak pozycji o kodzie kreskowym: ! ! ! Prosz? zwr?cic pozycj? do rodzimego oddzia?u: ! ! ! Pozycja ju? jest w docelowym oddziale. ! ! ! Pozycj? wypo?yczy?/a " ! onClick="openWindow(this,'Member', 480, 640); return false;"> ! i zosta?a zwr?cona. !
    !
    ! /images/holder.gif" width=24 height=24>
    ! !
    /images/background-mem.gif"> ! Wybierz oddzia?
    Oddzia? docelowy:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Wprowad? kod kreskowy ksi??ki
    Kod kreskowy pozycji:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Pozycje transferowane
    Kod kreskowyTytu?AutorTypOdDo
    align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center> align=center> align=center>
    ! ! ! --- 76,157 ----

    ! !
    /images/background-mem.gif">Komunikaty
    ! ! ! Reserve Cancelled
    ! ! ! Item should now be waiting at branch:
    ! ! ! ! ! Brak egzemplarza o kodzie: ! ! ! Please return item to home branch: ! ! ! Item is already at destination branch. ! ! ! Item was on loan to " ! onClick="openWindow(this,'Member', 480, 640); return false;"> and has been returned. !
    !
    ! /images/holder.gif" width=24 height=24>

    ! !
    /images/background-mem.gif"> ! Wybierz Oddzia??
    Oddzia?? Docelowy:
    ! /images/holder.gif" width=24 height=50 align=left> ! !
    /images/background-mem.gif"> ! Kod Paskowy Ksi????ki
    Kod paskowy pozycji:
    ! > ! ! value=> ! value=> ! value=> !
    !

    ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Transfered Items
    Kod PaskowyTytu??AutorTypFromTo
    > ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> >>>
    ! ! ! Index: circulation.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/circulation.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** circulation.tmpl 29 Oct 2003 23:38:05 -0000 1.2 --- circulation.tmpl 29 Feb 2004 19:41:57 -0000 1.2.2.1 *************** *** 1,62 **** ! ! !
    ! &branch=&printer=&print=yes> ! Nast?pny czytelnik  ! ! Zwroty  ! ! Transfery
    !

    Wypo?yczalnia: wypo?yczenia


    ! Oddzia?:
    ! Drukarka:
    ! Zmie? ustawienia
    ! ! Zwroty ! !   ! ! Transfery !
    !

    Wypo?yczalnia: wypo?yczenia


    ! Oddzia?:
    ! Drukarka:
    ! Zmie? ustawienia
    !
    /images/background-mem.gif"> ! Issuing Question
    ! --- 1,50 ---- ! ! !
    ! Pr?ba wypo?yczenia ! autorstwa dla . !

    ! &branch=&printer=&print=yes"> Nast??pny Czytelnik  Zwroty  Transfery
    !

    Cyrkulacja: Wypo??yczenia


    ! Oddzia??:
    ! Drukarka:
    ! Zmie?? Ustawienia ! "> ! "> !

     

    ! !
    ! Zwroty   Transfery
    !

    Cyrkulacja: Wypo??yczenia


    ! Oddzia??:
    ! Drukarka:
    ! Zmie?? Ustawienia ! "> ! "> !

     

    ! ! ! !
    /images/background-mem.gif"> ! Pytanie Wypo??yczenia
    ! *************** *** 65,105 **** !
    ! Pr??ba wypo??yczenia przez dla . !

    ! --- 53,93 ---- ! ! ! !
    !
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    		!
    ! > ! > ! > ! > ! > ! > ! > ! > ! > ! ! " value=""> ! ! !
    ! *************** *** 110,219 ****
    !
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    		!
    ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! "> ! ! " value=""> ! ! !
    ! !
    B??d przy wypo?yczeniu

    ! ! ! ! !
    /images/background-mem.gif">Wiadomo??
    !     ! !
    ! > ! > ! ! !
    /images/background-mem.gif"> ! Wybierz czytelnika
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Wprowad? numer karty czytelnika
    lub fragment nazwiska
    ! ! > ! >
    !     !
    !
    !
    ! ! ! ! !
    ! ! ! --- 98,207 ----
    /images/background-mem.gif"> ! Wprowad? kod kreskowy ksi??ki
    ! ! ! ! !
    Kod kreskowy pozycji:
    !
    ! ! !
    ! > Sticky Due Date
    ! > ! > ! > ! ! ! ! > !
    ! !
    B????d Wypo??yczenia Ksi????ki

    ! ! ! ! !
    /images/background-mem.gif">Komunikaty
    Nie znaleziono czytelnika
    ! ! ! ! "> ! "> ! ! !
    /images/background-mem.gif"> ! Wybierz czytelnika
    !
    !
    ! ! ! ! ! !
    /images/background-mem.gif"> ! Wprowad?? kart?? czytelnika
    lub pocz??tek nazwiska
    ! ! "> ! ">
    ! ! !
    !
    ! !
    ! ! ! *************** *** 225,312 ****
    /images/background-mem.gif"> ! Kod Paskowy Ksi????ki
    ! ! ! ! !
    Kod paskowy pozycji:
    !
    ! ! !
    ! > Sticky Due Date
    ! "> ! "> ! "> ! ! ! ! "> !
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Dane czytelnika
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Kategoria:
    OBCI??ENIA> onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    OBCI??ENIA onClick=\"openWindow(this, 'Payment', 480,640)\">Payment
    CZEKA ! ! &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">} ()
    !
    Zaleg?o?ciTak, patrz ni?ej
    UWAGI
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Wypo?yczenia dzi?
    Termin zwrotuKod kreskowyTytu?AutorKlasa
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Poprzednie wypo?yczenia
    Termin zwrotuKod kreskowyTytu?AutorKlasa
    align=center> align=center> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">>> align=center>
    !     ! --- 213,309 ----

    		! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    O czytelniku
    ! " onClick="openWindow(this,'Member', 480, 640)"> ! !
    Kategoria:
    GNA>Czytelnik znikn???? bez adresu
    ZGUBIONA>Karta czytelnika zagin????a
    ODBLOKOWANY>Czytelnik jest odblokowany
    OP??ATY>" onClick="openWindow(this, 'Payment', 480,640)">P??atno????
    >
    OP??ATY" onClick="openWindow(this, 'Payment', 480,640)">P??atno????
    OCZEKUJ??CE ! ! &type=intra" onClick="openWindow(this, 'Item', 480, 640)"> ()
    !
    ZLEG??ETak, zob. poni??ej
    UWAGI
    !
    !



    ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Dzisiejsze Wypo??yczenia
    Do ZwrotuKod PaskowyTytu??AutorTyp pozycji
    >> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">">">">
    ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif"> ! ! Poprzednie Wypo??yczenia
    Do ZwrotuKod PaskowyTytu??AutorTyp pozycji
    ">"> ! &type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">">">">
    ! ! From kb2qzv at users.sourceforge.net Sun Feb 29 20:45:41 2004 From: kb2qzv at users.sourceforge.net (Benedict P. Barszcz) Date: Sun, 29 Feb 2004 11:45:41 -0800 Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/pl/parameters koha2marclinks.tmpl,1.1,1.1.2.1 marc_subfields_structure.tmpl,1.2,1.2.2.1 marctagstructure.tmpl,1.2,1.2.2.1 Message-ID: Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9524/parameters Modified Files: Tag: rel_2_0 koha2marclinks.tmpl marc_subfields_structure.tmpl marctagstructure.tmpl Log Message: Index: koha2marclinks.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/koha2marclinks.tmpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -r1.1 -r1.1.2.1 *** koha2marclinks.tmpl 10 Jan 2003 19:46:32 -0000 1.1 --- koha2marclinks.tmpl 29 Feb 2004 19:45:39 -0000 1.1.2.1 *************** *** 1,22 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj si? do Koha

    !     ! ! !

    !

    Wybierz i sprawd? 1 z nast?puj?cych dla .

    !
    ! "> ! "> ! --- 1,16 ---- ! ! ! !

    !

    Choose and validate 1 of the following for .

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    ! "> ! "> ! *************** *** 26,35 ****
    ! "> ! "> ! --- 20,29 ----
    ! "> ! "> ! *************** *** 39,48 ****
    ! "> ! "> ! --- 33,42 ----
    ! "> ! "> ! *************** *** 52,61 ****
    ! "> ! "> ! --- 46,55 ----
    ! "> ! "> ! *************** *** 65,74 ****
    ! "> ! "> ! --- 59,68 ----
    ! "> ! "> ! *************** *** 78,87 ****
    ! "> ! "> ! --- 72,81 ----
    ! "> ! "> ! *************** *** 91,100 ****
    ! "> ! "> ! --- 85,94 ----
    ! "> ! "> ! *************** *** 104,113 ****
    ! "> ! "> ! --- 98,107 ----
    ! "> ! "> ! *************** *** 117,126 ****
    ! "> ! "> ! --- 111,120 ----
    ! "> ! "> ! *************** *** 130,139 ****
    ! "> ! "> ! --- 124,133 ----
    ! "> ! "> ! *************** *** 144,154 ****
    !

    Aby "odmapowa?", kliknij ==>

    		 ! ! "> ! "> --- 138,148 ----
    !

    To "unmap", click ==>

    		 ! ! "> ! "> *************** *** 157,189 ****
    ! ! ! ! Linki MARC !

    ! ! ! ! ! ! ! ! ! ! ! ! !
    Pole koha ?EtykietaPodpoleLib ! !
    ">edytuj
    !     ! ! --- 151,183 ----
    ! ! ! ! ????cza MARC !

    NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script. !

    !
    !
    ! ! ! ! ! ! ! ! ! ! !
    Koha field ?TagSubfieldLib ! !
    ">/images/fileopen.png" width=32 hspace=0 vspace=0 border=0>
    ! ! Index: marc_subfields_structure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marc_subfields_structure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** marc_subfields_structure.tmpl 27 Jan 2003 08:15:40 -0000 1.2 --- marc_subfields_structure.tmpl 29 Feb 2004 19:45:39 -0000 1.2.2.1 *************** *** 2,118 **** ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj si? do Koha

    !     ! ! ! !

    !
    ! ! ! ! ! ! ! ! ! ! ! ! !
    Pole Lib for librarians / for opac Repet MandPole Koha TabAuthorised value or
    ! Thesaurus category
    -
    !
    ! or
    ! or
    !

    Uwaga: w ostatniej kolumnie nale?y wybra?: !

    • "Warto?? autoryzown?": Odnosi si? do szeregu warto?ci autoryzowanych dla tego podpola. Sp?jrz: odpowiednia tablica administratora
      • !
    • "Kategoria tezaurusa": Odnosi si? do kategorii tezaurusa. Zobacz odpowiedni? tablice administratora.
      • !
    • "Kreator warto?ci: Jest to program w perlu, kt?ry pomaga wybra? warto?? pola. Zale?y on od odmiany-MARC i wype?nia automatycznie niekt?re podpola.

    !     ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! dane wymazane !
    '> !     ! ! ! ! ! ! ! ! ! !
    Podpole
     
    POTWIERD? WYMAZANIE
    ">
    TakNieTakNie">usu?
    - ! ! !
    ">Powr?t do znacznik?w
    !     ! --- 2,112 ---- ! ! ! ! !

    ! ! ! ! ! ! ! ! ! ! ! ! ! !
    Field Lib for librarians / for opac Repet MandKoha field TabWarto???? autoryzowana lub
    ! Kategoria tezaurusa
    - " size=40 maxlength=80>
    ! " size=40 maxlength=80>
    ! or
    ! or
    !

    Note: in the last column, you can choose: !

    • An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.
      • !
    • A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.
      • !
    • A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.

    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! Data deleted ! "> ! ! ! !

    Admin struktury podp??l MARC dla

    !

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    !

    The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.

    ! !
    Subfield
     
    POTWIERDZENIE WYMAZANIA
    ">
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    SubfieldLibKoha field ?Rep ?Mand ?Tab ?Warto??ci ?Tezaurus ?Val build ?Wyma??
    TakNieTakNie">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    /images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0>/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 >/images/1rightarrow.png" title="next" ALT="next" BORDER=0>
    ! ! Index: marctagstructure.tmpl =================================================================== RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marctagstructure.tmpl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -r1.2 -r1.2.2.1 *** marctagstructure.tmpl 10 Jan 2003 16:45:34 -0000 1.2 --- marctagstructure.tmpl 29 Feb 2004 19:45:39 -0000 1.2.2.1 *************** *** 1,9 **** ! ! ! !

    Zalogowano jako: [Wyloguj]

    ! !

    Zaloguj si? do Koha

    !     ! ! !

    !
    ! ! ! ! ! !
    Zmienna
    Lib for librarians
    Lib for opac
    Powtarzalne
    Konieczne
    Warto?? autoryzowana (je?li wybierzesz jak?? warto?? tutaj, wska?niki zostan? ograniczone tylko do zbioru tych warto?ci)
     
    !     ! ! ! ! ! ! ! ! ! ! ! ! ! dane usuni?to !
    !     ! ! ! Zarz?dzaj struktur? etykiet MARC (znacznik?w) !
    ! !
    Etykieta (znacznik)
     
    POTWIERD? USUNI?CIE
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    EtykietaLibPowtarzalnaKoniecznaAutoryzowana
    warto??    		Podpola  
    TakNieTakNie">podpola">Edytuj">Usu?
    ! ! !
    -

    !     ! ! ! --- 52,152 ---- ! ! !

    !
    ! ! ! ! ! !
    Tag
    Lib for librarians
    Lib for opac
    Repeatable
    Mandatory
    Warto???? Autoryzowana (je??li wprowadzisz tutaj jak???? warto???? to wska??niki b??d?? ograniczone do listy autoryzowanych warto??ci)
     
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! Data deleted ! ! ! ! !

    MARC tag structure admin

    ! NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script. ! ! !
    /images/background-mem.gif">tag/images/background-mem.gif">
     
    POTWIERDZENIE WYMAZANIA
    ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
    /images/background-mem.gif">Tag/images/background-mem.gif">Lib/images/background-mem.gif">Repeatable/images/background-mem.gif">Mandatory/images/background-mem.gif">Autoryzowana
    warto????    		/images/background-mem.gif">Subfields/images/background-mem.gif">Edytuj/images/background-mem.gif">Wyma??
    TakNieTakNie">subfields">//images/fileopen.png" width=32 hspace=0 vspace=0 border=0>">//images/edittrash.png" width=32 hspace=0 vspace=0 border=0>
    ! ! ! !
    ! ! ! ! ?offset=&searchfield="> ! //images/1leftarrow.png" title="previous" ALT="previous" BORDER=0> ! ! ! ! ! ?offset=&searchfield="> ! //images/1rightarrow.png" title="next" ALT="next" BORDER=0> ! ! !
    ! !