[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.01-67-g2318da6

Git repo owner gitmaster at git.koha-community.org
Sun Jan 22 21:51:48 CET 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 16.11.x has been updated
       via  2318da68538264f9abff4ab5a69019b8eb20b2ab (commit)
       via  9493a607b9dbf404cb081e1b55a03fbed1b14755 (commit)
       via  3998eadbb2c090a35fa0d0ac1cdddf16a9234634 (commit)
       via  08d780aca2d905098df566a331e141ec02988ca5 (commit)
       via  6f1c11fdaeca6a89645bee7ead233a54c371caf1 (commit)
       via  e1846edc4a702167a0318dec41b1b556c4108451 (commit)
       via  fe9b1c5db3954772ccb47601edb98191fc43f256 (commit)
       via  b97bca9ac763c8faedb0dd8e88d522d4f4fc7050 (commit)
       via  ed44281c4bdd31a26daacdfb69cb67032182a504 (commit)
       via  b1a5e0eb1e137f02535fb16cc2c4b2d394b1ece1 (commit)
       via  788f506e3e83fc754b93c7343d5a19ec383de7b4 (commit)
       via  980dc1721d8fe20bd6dcb6f09f8433f795e366f2 (commit)
       via  172d7e1e87ab940b92b9bee7a39133ff0a8d803b (commit)
       via  7297157533fd7d446a43445035d8cfb500d6df8c (commit)
       via  5c9ef7c8ed215698d864dbc4c0036195bd42bc42 (commit)
       via  849adfe6610e84a533ef2a5722c6d0ba2bfa143e (commit)
       via  469df9f53438b399800507a5201a8c6a3f997742 (commit)
       via  6fba093b1eb47858c7c13305f6e7c860d6ed4e63 (commit)
       via  4f5b6fb5dcebdd67f8100d0be8d676b292086f22 (commit)
       via  a0cce966bac9dc77280bbb4a7c58c212c28d63db (commit)
       via  8b428cacaaff5ea6da6142aa3fbab31eb3712e44 (commit)
       via  8b21662a38d2b63f594c653e15c7a17a3c4bc033 (commit)
       via  f8ce80f9229d109039dbe2e9f8e4819fdca28655 (commit)
       via  f2ff05336f5852e8daf79ed4840866b3ceed4f69 (commit)
       via  32f3f1dd2944f86bdf01355100050371d531dbbe (commit)
       via  1c37f1fc232e50192b55740af1a8bad3fc763f6c (commit)
       via  b797b1b01de2487207c30a4495e79e27e234d777 (commit)
       via  363ab70b06f00eff5a4fa17a70964c6cafe89d8a (commit)
       via  5dc1daeb18a3794949b8fcf4d0e8929e30f2360f (commit)
       via  020f442965bf26ab134d135e831cf446a867a7d1 (commit)
       via  de76cd9c5c60bf737c6fe32a99b4dfabccf4c5c3 (commit)
       via  ca7d49e69b0aeaddb14b6b8bbf1695274c1ac670 (commit)
      from  87e3be143b99f7094848045b044ea7685605cf64 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2318da68538264f9abff4ab5a69019b8eb20b2ab
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Jan 22 21:41:34 2017 +0100

    Increment version for 16.11.02 release

commit 9493a607b9dbf404cb081e1b55a03fbed1b14755
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sun Jan 22 08:50:41 2017 -0300

    Translation updates for Koha 16.11.02
    
    (cherry picked from commit dfc3e1db682b9fbb7c3046f6432f1b74a3fca29b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 3998eadbb2c090a35fa0d0ac1cdddf16a9234634
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Jan 13 16:10:20 2017 +0100

    Bug 17899 - Show only mine does not work in newordersuggestion.pl
    
    Bug 12775 added a link "Show only mine" in newordersuggestion.pl.
    This does not work, no results.
    
    Also corrects the fact that click must not do default action by adding e.preventDefault().
    
    Test plan :
    - You must have suggestions you have accepted
    - Create a new order from suggestion : /cgi-bin/koha/acqui/newordersuggestion.pl
    - Click on Show only mine
    => Without patch the table is empty showing "No matching records found"
    => With patch you see only suggestions you have accpeted
    
    Signed-off-by: Zoe Schoeler <crazy.mental.onion at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 1104e61635e2d567c89587c28fd9a24b4f262037)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 08d780aca2d905098df566a331e141ec02988ca5
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Tue Jan 17 06:42:11 2017 +0000

    Bug 17920: t/db_dependent/Sitemapper.t fails because of permissions
    
    The directory it attempts to create an xml file may not be writable for
    the user running the test. By changing the directory from the current
    directory to a temporary one, the test runs. After all 'chmod 777
    t/db_dependent' is a bad idea.
    
    TEST PLAN
    ---------
    1) sudo koha-shell "prove t/db_dependent/Sitemapper.t" kohadev
       -- fails
    2) apply patch
    3) sudo koha-shell "prove t/db_dependent/Sitemapper.t" kohadev
       -- succeeds
    4) run koha qa test tools
    
    Tested without qa tools
    Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 7401d9422be26c5ff900269a10e70c9ca4364de6)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 6f1c11fdaeca6a89645bee7ead233a54c371caf1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Dec 23 09:18:03 2016 +0000

    Bug 17808: Fix behavior when editing a circ rule
    
    The original behavior is broken, see https://stackoverflow.com/questions/21410484/jquery-selector-to-find-out-count-of-non-empty-inputs
    
    Test plan:
    Edit a circ rule
    => Without this patch you get a useless message
    => With this patch, no message
    Edit a circ rule with content in inputs
    => With or without this patch you get a useful message
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 5a9ffa92cecf69ec44450da9676cfbdb0f7d9fa1)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit e1846edc4a702167a0318dec41b1b556c4108451
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Jan 20 12:16:44 2017 +0100

    Bug 17909: QA followup: remove unused var and move global var
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e3a12e517a9039fa93b8b57e0adedbad5f0e9153)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit fe9b1c5db3954772ccb47601edb98191fc43f256
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jan 20 11:29:30 2017 +0100

    Bug 17909: [Follow-up] Quick fix for UNIMARC
    
    UNIMARC inserts field 100. This interferes the field count and order
    in the test.
    Note: This is a quick fix. Will polish it after bug 17913.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9510b023300cfdd3a560d06b0bdb5944d43d3d5c)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit b97bca9ac763c8faedb0dd8e88d522d4f4fc7050
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Mon Jan 16 13:03:21 2017 +0000

    Bug 17909: Followup - fix typos
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    EDIT:
    
    Adjusted three small typos that did not disturb the test in its current
    form, but do when we are fixing bugs on bug 17913.
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b5a95937e695dec4a7ecbff6f65d795af9ee029b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit ed44281c4bdd31a26daacdfb69cb67032182a504
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jan 16 12:15:56 2017 +0100

    Bug 17909: Additional polishing
    
    No spectacular things:
    
    [1] Move the framework modifications to a sub. Use same style to create auth types and linked fields.
    [2] Change some new Object occurrences to Object->new.
    [3] Add tests for field count and field order in the first two subsets.
    [4] Few whitespace changes (sorry) and comment lines.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 4457d2e64c30f95fc79e306023e271ee7274b740)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit b1a5e0eb1e137f02535fb16cc2c4b2d394b1ece1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jan 4 11:15:51 2017 +0100

    Bug 17909: Add tests for merging with another authtype
    
    Originally aimed for bug 9988. Adjusted in line with other subtests.
    Will polish the three subtests a little more on a follow-up.
    
    Test plan:
    Run t/db_dependent/Authorities/Merge.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a7c2fc75054e81ca8909e05b6c2cfd6b9ba7293b)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 788f506e3e83fc754b93c7343d5a19ec383de7b4
Author: mbeaulieu <mbeaulieu at inlibro.com>
Date:   Mon Aug 18 10:04:55 2014 -0400

    Bug 17909: Adding tests from bug 11315
    
    Based on original patch from Maxime Beaulieu on bug 11315.
    Amended by Marcel de Rooy on report 17909.
    
    EDIT:
    
    Original tests have been adjusted in view of:
    [1] Test on bug 11315 heavily leaned on DBD::Mock. Since we are
        using Test::DBIx::Class on such tests now, this would need attention.
        Moreover, the advantage of mocking the database in this case is at
        least arguable.
    [2] Matching the first (somewhat older) subtest of 11700.
    [3] Simplification and readability.
        Look e.g. at the use of $MARCto and $MARCfrom on 11315.
    
    This made me merge them in the db_dependent counterpart.
    
    Also note that this subtest adds another needed test case: the merge from
    auth1 to modified auth1, while 11700 tested auth1 to auth2.
    
    Test plan:
    Just run t/db_dependent/Authorities/Merge.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b89be0d72fb24752bf5a2d939b15f90e6f23017d)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 980dc1721d8fe20bd6dcb6f09f8433f795e366f2
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Feb 19 11:31:13 2014 +0100

    Bug 17909: Add unit tests for C4::AuthoritiesMarc::merge
    
    Original patch from Julian Maurice on bug 11700.
    With sign offs by:
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Amended by Marcel de Rooy on report 17909.
    
    EDIT (January 2017):
    Removed some tests not related to merge.
    Put remaining tests in a subtest, made them working on current merge.
    Slightly revised the mocking.
    
    Note: I plan to move the zebra retrieval stuff outside merge in one of
    the next stages, and replace it by calling Koha::SearchEngine. This will
    reduce mocking complexity here.
    
    Test plan:
    Just run t/db_dependent/Authorities/Merge.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d4de65c21f4671b3fbbaf6d00904fe1753a8ae9a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 172d7e1e87ab940b92b9bee7a39133ff0a8d803b
Author: David Cook <dcook at prosentient.com.au>
Date:   Thu Jan 12 11:15:22 2017 +1100

    Bug 17880 - Use version.pm to parse version numbers in C4::Installer::PerlModules
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b732963e2f91a54894f12cd5fd964c21e1c6f533)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 7297157533fd7d446a43445035d8cfb500d6df8c
Author: David Cook <dcook at prosentient.com.au>
Date:   Thu Jan 12 11:14:34 2017 +1100

    Bug 17880 - Add test to check version number comparison
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2321ae0d796fa6b13cde8f321b6c697cc48a5437)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5c9ef7c8ed215698d864dbc4c0036195bd42bc42
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Jan 19 00:38:52 2017 +0000

    Bug 17917: [AMENDED] Fix path issue in t/db_dependent/check_sysprefs.t
    
    EDIT (from Marcel):
    
    Previous patch fixes issue caused by Search.t.
    This patch still adds some small changes to check_sysprefs.t.
    
    Signed-off-by: Grace McKenzie <grace.mcky at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 743dbe3e6423f51ae93477ef58a9d696661bf2cd)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 849adfe6610e84a533ef2a5722c6d0ba2bfa143e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jan 20 10:11:47 2017 +0100

    Bug 17917: [QA Follow-up] Reprove Search.t
    
    The config tweaks from Search.t break check_sysprefs.t later on.
    Clearing the cache resolves that.
    
    Test plan:
    [1] Run prove t/db_dependent/Search.t t/db_dependent/check_sysprefs.t (in
        one statement) before and after applying this patch.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    A prove t/db_dependent did not fail check_sysprefs.t (only skipping two
    tests: 00-strict.t and Koha/IssuingRules.t; not enough patience)
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b5c2b6510761dad352c814d801cda47aa6161ae8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 469df9f53438b399800507a5201a8c6a3f997742
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Jan 19 15:22:05 2017 +0000

    Bug 17615 - Fix unit tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 6d2ce70a479367530ef7973251e799e7be6f44db)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 6fba093b1eb47858c7c13305f6e7c860d6ed4e63
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Wed Nov 16 10:37:48 2016 +0000

    Bug 17615 - Fix updating borrower attributes in checkpw_ldap
    
    Signed-off-by: Oliver Bock <oliver.bock at aei.mpg.de>
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e331a9c0d061f586f50db7ac27390417c74aec48)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 4f5b6fb5dcebdd67f8100d0be8d676b292086f22
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jan 19 10:56:30 2017 +0100

    Bug 7143: [QA Follow-up] Handling tabs
    
    Editing spaces before releases and developer:
    876,$s/  \+releases$/^Ireleases/ (20 substitutions)
    876,$s/  \+developer$/^Ideveloper/ (7 substitutions on 7 lines)
    
    Editing spaces between date and text:
    876,$s/2016  \+/2016^I/
    876,$s/2017  \+/2017^I/
    Fixed a few single spaces too.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Display on Timeline tab looks good now.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d379be5de02b60b55408b42394c2ff1dae0113c5)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit a0cce966bac9dc77280bbb4a7c58c212c28d63db
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jan 19 10:41:23 2017 +0100

    Bug 7143: [QA Follow-up] Correcting dates for first patch pushed
    
    The date first patch pushed is not the date the patch was written. The
    Bugzilla reports tell us when the patch got actually pushed.
    Adjusting the developer numbers accordingly.
    Authors radiuscz and Radek Siman are actually the same person.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit d7e01a8c33b480a9faef027397d04fde0d8e37e2)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8b428cacaaff5ea6da6142aa3fbab31eb3712e44
Author: Rebecca Blundell <rebecca.blundell at catalyst.net.nz>
Date:   Thu Jan 12 12:19:09 2017 +1300

    Bug 7143: Update about.tt with new devs
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a9f883456bee020737e38004de3386d3f617c866)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 8b21662a38d2b63f594c653e15c7a17a3c4bc033
Author: Rebecca Blundell <rebecca.blundell at catalyst.net.nz>
Date:   Thu Jan 12 10:35:17 2017 +1300

    Bug 7143: Update history file
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 5d333a80925473d3b9943f7de37cd8eb224263c8)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit f8ce80f9229d109039dbe2e9f8e4819fdca28655
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 19 14:32:56 2017 +0100

    Bug 17469: Fix number of values
    
    Will fix
      ERROR 1136 (21S01) at line 57: Column count doesn't match value count at row 2
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2ce4b1635d24179fb3d5b11459045d86b9cf977e)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit f2ff05336f5852e8daf79ed4840866b3ceed4f69
Author: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Date:   Tue Jan 17 02:11:51 2017 +0000

    Bug 17469: Follow-up adding hold print notice
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c7dc340d639bf53abc204c96d3ffc8154db16069)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 32f3f1dd2944f86bdf01355100050371d531dbbe
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Thu Oct 20 00:10:52 2016 +0200

    Bug 17469: Add missing sample notices to fr-CA web installer
    
    Adds missing notices to the fr-CA web installer:
    - MEMBERSHIP_EXPIRY
    - PASSWORD_RESET
    Renames RESERVESLIP to HOLD_SLIP
    
    TEST PLAN
    ---------
    1) Apply the first patch
    2) prove xt/sample_notices.t
       -- it should fail for fr-CA.
    3) Apply the second patch
    4) prove xt/sample_notices.t
       -- it should pass.
    5) run all tests (prove t; prove xt)
       -- they should generally pass
    6) run koha qa test tools
    
    NOTE: Split test patch from fix patch, so could prove problem
          exists easily.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b37b22a4fd7aa3f4a59a1c541aae2fcd5b9cbd1f)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 1c37f1fc232e50192b55740af1a8bad3fc763f6c
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Thu Oct 20 00:10:52 2016 +0200

    Bug 17469: Add missing sample notices fr-CA test
    
    Add fr-CA installer to xt/sample_letter.t
    
    To test:
    - Verify xt/sample_letter.t test checks fr-CA now and
      fails for just fr-CA.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 3c09fefb1dd3c8728404ef641f95885e61a674f4)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit b797b1b01de2487207c30a4495e79e27e234d777
Author: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Date:   Tue Jan 17 22:41:52 2017 +0000

    Bug 15460 Adding spaces after subfields c and h of 245
    
    Test Plan
    1: Add something inside c and h of 245 on a Bibliographic Record. There won't be a space between
    the c and h
    2: This will occur on both the search results and the details pages of
    the record in both the intranet and opac.
    3: Apply the patch
    4: Refresh and see that there is now a space between c and h.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 8fcfdf6853267d81f644e8f32f647dc192f5ab86)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 363ab70b06f00eff5a4fa17a70964c6cafe89d8a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Dec 8 12:28:53 2016 +0100

    Bug 17931: Remove unused vars from reserves_stats
    
    Change to Modern::Perl.
    Remove null_to_zzempty and add a few blank lines between subs.
    Remove unused vars: $podsp, $type, $daysel, $monthsel and $mime.
    Removing trailing 1;
    
    Test plan:
    Run a few reports from reports/reserves_stats.pl
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Emma Smith <emma.nakamura.smith at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Wrongly pasted from reports/issues_stats.pl initially
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 639489f48f5285ec7990a01b8e991719edf45af4)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 5dc1daeb18a3794949b8fcf4d0e8929e30f2360f
Author: Emma Smith <emma.nakamura.smith at gmail.com>
Date:   Tue Jan 17 20:54:18 2017 +0000

    Bug 17891: Remove extra div tag in the housebound module
    
    This fixes the menu layout issue.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 36a637974b6f17b083d3b19616c3b8cf5fa7e4c9)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit 020f442965bf26ab134d135e831cf446a867a7d1
Author: Magnus Enger <magnus at libriotech.no>
Date:   Tue Jan 17 14:50:49 2017 +0000

    Bug 17924 - Fix error in password recovery
    
    To test:
    
    - Set OpacResetPassword = allowed
    - Make sure you have a user with a username and email
    - Go to the OPAC and make sure you are not logged in
    - Click on the "Forgot your password?" link
    - Fill in "Login" and "Email" and click on "Submit"
    - You will get an error that says:
    
    Undefined subroutine &C4::Letters::GetPreparedLetter called at
    /home/vagrant/kohaclone/Koha/Patron/Password/Recovery.pm line 142.
    
    - Apply the patch
    - The steps above will have added your user to the borrower_password_recovery
      table in the database. Delete it from there to make sure you start a
      fresh reset request.
    - Repeat the steps above and notice that the error is gone. You should
      get a nice message instead that says "An email has been sent to [your
      email]".
    - Sign off
    
    Signed-off-by: Zoe Schoeler <crazy.mental.onion at gmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b43b79156f179094ed16a896f0bf0b3d39b4af7d)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit de76cd9c5c60bf737c6fe32a99b4dfabccf4c5c3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Dec 14 16:48:45 2016 +0100

    Bug 17777: koha-remove should deal with temporary uploads
    
    If the temporary upload folder exists, it should be discarded when
    removing an instance. If we do not, it may/will create problems when
    recreating the same instance.
    
    A function in koha-functions.sh is added to determine the temp directory
    instead of hardcoding /tmp.
    
    Test plan:
    [1] Copy koha-functions.sh to /usr/share/koha/bin
    [2] Run koha-create --create-db newinstancexx
    [3] Run mkdir /tmp/koha_newinstancexx_upload (if /tmp is your temp!)
    [4] Run debian/scripts/koha-remove newinstancexx
        Do not run the regular one, but verify that you use the updated one.
    [5] Check that /tmp/koha_newinstancexx_upload is gone.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Karen Jen <karenliang.student at wegc.school.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2c40579077b67d4203665b7e6ecdb749235456a4)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

commit ca7d49e69b0aeaddb14b6b8bbf1695274c1ac670
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jan 16 11:51:01 2017 +0100

    Bug 17914: Do not try and add the updated_on columns to the borrowers and deletedborrowers table
    
    Bug 10459 has been backported and the DB entry (add borrowers.updated_on and
    deletedborrower.updated_on) is now played in
      - 16.06.00.027
      - 16.05.00.002
      - 3.22.08.001
    
    This will raise a MySQL warning if the column already exists.
      DBD::mysql::db do failed: Duplicate column name 'updated_on'
    
    Since bug 17234 we have now a subroutine (C4::Installer::column_exists) to test
    if a column exists.
    When a DB entry modifying the DB structure is backported, it HAS TO check if the
    column, constraint or table exists before executing the query.
    
    Test plan:
    git checkout 3.22.x (16.05.x or 16.11.x)
    install Koha
    git checkout master
    execute the installer
    => Without this patch you will get a warning when adding borrowers.updated_on)
    => With this patch, you should not get it
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2b303129b82a5134f04c24907c05bf863603fef7)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth_with_ldap.pm                               |    2 +-
 C4/Installer/PerlModules.pm                        |    8 +-
 Koha.pm                                            |    2 +-
 Koha/Patron/Password/Recovery.pm                   |    1 +
 debian/scripts/koha-functions.sh                   |   20 +
 debian/scripts/koha-remove                         |    6 +
 docs/history.txt                                   |   27 +
 .../mysql/fr-CA/obligatoire/sample_notices.sql     |    7 +-
 installer/data/mysql/updatedatabase.pl             |   32 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    7 +
 .../prog/en/modules/acqui/newordersuggestion.tt    |    8 +-
 .../prog/en/modules/admin/smart-rules.tt           |    2 +-
 .../prog/en/modules/members/housebound.tt          |    1 -
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    4 +-
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |    4 +-
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |    4 +-
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   |    4 +-
 misc/translator/po/am-Ethi-marc-MARC21.po          |    2 +-
 misc/translator/po/am-Ethi-marc-NORMARC.po         |    2 +-
 misc/translator/po/am-Ethi-marc-UNIMARC.po         |    2 +-
 misc/translator/po/am-Ethi-opac-bootstrap.po       |    2 +-
 misc/translator/po/am-Ethi-staff-help.po           |   15 +-
 misc/translator/po/am-Ethi-staff-prog.po           |  282 +-
 misc/translator/po/ar-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ar-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ar-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ar-Arab-opac-bootstrap.po       |    8 +-
 misc/translator/po/ar-Arab-pref.po                 |  854 +++---
 misc/translator/po/ar-Arab-staff-help.po           |   15 +-
 misc/translator/po/ar-Arab-staff-prog.po           |  288 +-
 misc/translator/po/as-IN-marc-MARC21.po            |    2 +-
 misc/translator/po/as-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/as-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/as-IN-opac-bootstrap.po         |    2 +-
 misc/translator/po/as-IN-staff-help.po             |   15 +-
 misc/translator/po/as-IN-staff-prog.po             |  279 +-
 misc/translator/po/az-AZ-marc-MARC21.po            |    2 +-
 misc/translator/po/az-AZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/az-AZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/az-AZ-opac-bootstrap.po         |    2 +-
 misc/translator/po/az-AZ-staff-help.po             |   15 +-
 misc/translator/po/az-AZ-staff-prog.po             |  279 +-
 misc/translator/po/be-BY-marc-MARC21.po            |    2 +-
 misc/translator/po/be-BY-marc-NORMARC.po           |    2 +-
 misc/translator/po/be-BY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/be-BY-opac-bootstrap.po         |    2 +-
 misc/translator/po/be-BY-staff-help.po             |   15 +-
 misc/translator/po/be-BY-staff-prog.po             |  279 +-
 misc/translator/po/bg-Cyrl-marc-MARC21.po          |    2 +-
 misc/translator/po/bg-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |    2 +-
 misc/translator/po/bg-Cyrl-staff-help.po           |   15 +-
 misc/translator/po/bg-Cyrl-staff-prog.po           |  282 +-
 misc/translator/po/bn-IN-marc-MARC21.po            |    2 +-
 misc/translator/po/bn-IN-marc-NORMARC.po           |    2 +-
 misc/translator/po/bn-IN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/bn-IN-opac-bootstrap.po         |    2 +-
 misc/translator/po/bn-IN-staff-help.po             |   15 +-
 misc/translator/po/bn-IN-staff-prog.po             |  279 +-
 misc/translator/po/ca-ES-marc-MARC21.po            |    2 +-
 misc/translator/po/ca-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/ca-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ca-ES-opac-bootstrap.po         |    2 +-
 misc/translator/po/ca-ES-staff-help.po             |   15 +-
 misc/translator/po/ca-ES-staff-prog.po             |  279 +-
 misc/translator/po/cs-CZ-marc-MARC21.po            |    2 +-
 misc/translator/po/cs-CZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/cs-CZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po         |    6 +-
 misc/translator/po/cs-CZ-pref.po                   |   10 +-
 misc/translator/po/cs-CZ-staff-help.po             |   15 +-
 misc/translator/po/cs-CZ-staff-prog.po             |  300 +-
 misc/translator/po/cy-GB-marc-MARC21.po            |    2 +-
 misc/translator/po/cy-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/cy-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/cy-GB-opac-bootstrap.po         |    2 +-
 misc/translator/po/cy-GB-staff-help.po             |   15 +-
 misc/translator/po/cy-GB-staff-prog.po             |  279 +-
 misc/translator/po/da-DK-marc-MARC21.po            |   53 +-
 misc/translator/po/da-DK-marc-NORMARC.po           |    2 +-
 misc/translator/po/da-DK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/da-DK-opac-bootstrap.po         |   68 +-
 misc/translator/po/da-DK-staff-help.po             |   15 +-
 misc/translator/po/da-DK-staff-prog.po             |  304 +-
 misc/translator/po/de-CH-marc-MARC21.po            |    2 +-
 misc/translator/po/de-CH-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-CH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-CH-opac-bootstrap.po         |    2 +-
 misc/translator/po/de-CH-pref.po                   |    9 +-
 misc/translator/po/de-CH-staff-help.po             |   20 +-
 misc/translator/po/de-CH-staff-prog.po             |  295 +-
 misc/translator/po/de-DE-marc-MARC21.po            |   10 +-
 misc/translator/po/de-DE-marc-NORMARC.po           |    2 +-
 misc/translator/po/de-DE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/de-DE-opac-bootstrap.po         |    8 +-
 misc/translator/po/de-DE-pref.po                   |    9 +-
 misc/translator/po/de-DE-staff-help.po             |   20 +-
 misc/translator/po/de-DE-staff-prog.po             |  313 +-
 misc/translator/po/el-GR-marc-MARC21.po            |    8 +-
 misc/translator/po/el-GR-marc-NORMARC.po           |    2 +-
 misc/translator/po/el-GR-marc-UNIMARC.po           |    8 +-
 misc/translator/po/el-GR-opac-bootstrap.po         |    9 +-
 misc/translator/po/el-GR-pref.po                   |  292 +-
 misc/translator/po/el-GR-staff-help.po             |   34 +-
 misc/translator/po/el-GR-staff-prog.po             |  469 +--
 misc/translator/po/en-GB-marc-MARC21.po            |    2 +-
 misc/translator/po/en-GB-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-GB-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-GB-opac-bootstrap.po         |    2 +-
 misc/translator/po/en-GB-staff-help.po             |   15 +-
 misc/translator/po/en-GB-staff-prog.po             |  282 +-
 misc/translator/po/en-NZ-marc-MARC21.po            |    2 +-
 misc/translator/po/en-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/en-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/en-NZ-opac-bootstrap.po         |    2 +-
 misc/translator/po/en-NZ-staff-help.po             |   15 +-
 misc/translator/po/en-NZ-staff-prog.po             |  288 +-
 misc/translator/po/eo-marc-MARC21.po               |    2 +-
 misc/translator/po/eo-marc-NORMARC.po              |    2 +-
 misc/translator/po/eo-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eo-opac-bootstrap.po            |   97 +-
 misc/translator/po/eo-staff-help.po                |   15 +-
 misc/translator/po/eo-staff-prog.po                |  279 +-
 misc/translator/po/es-ES-marc-MARC21.po            |    2 +-
 misc/translator/po/es-ES-marc-NORMARC.po           |    2 +-
 misc/translator/po/es-ES-marc-UNIMARC.po           |    2 +-
 misc/translator/po/es-ES-opac-bootstrap.po         |    6 +-
 misc/translator/po/es-ES-pref.po                   |   12 +-
 misc/translator/po/es-ES-staff-help.po             |   21 +-
 misc/translator/po/es-ES-staff-prog.po             |  303 +-
 misc/translator/po/eu-marc-MARC21.po               |   23 +-
 misc/translator/po/eu-marc-NORMARC.po              |    2 +-
 misc/translator/po/eu-marc-UNIMARC.po              |    2 +-
 misc/translator/po/eu-opac-bootstrap.po            |  861 +++---
 misc/translator/po/eu-staff-help.po                |   15 +-
 misc/translator/po/eu-staff-prog.po                |  282 +-
 misc/translator/po/fa-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/fa-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/fa-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/fa-Arab-opac-bootstrap.po       |    2 +-
 misc/translator/po/fa-Arab-staff-help.po           |   15 +-
 misc/translator/po/fa-Arab-staff-prog.po           |  279 +-
 misc/translator/po/fi-FI-marc-MARC21.po            |    2 +-
 misc/translator/po/fi-FI-marc-NORMARC.po           |    2 +-
 misc/translator/po/fi-FI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fi-FI-opac-bootstrap.po         |    2 +-
 misc/translator/po/fi-FI-pref.po                   |    9 +-
 misc/translator/po/fi-FI-staff-help.po             |   21 +-
 misc/translator/po/fi-FI-staff-prog.po             |  310 +-
 misc/translator/po/fo-FO-marc-MARC21.po            |    2 +-
 misc/translator/po/fo-FO-marc-NORMARC.po           |    2 +-
 misc/translator/po/fo-FO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fo-FO-opac-bootstrap.po         |    2 +-
 misc/translator/po/fo-FO-staff-help.po             |   15 +-
 misc/translator/po/fo-FO-staff-prog.po             |  279 +-
 misc/translator/po/fr-CA-marc-MARC21.po            |    2 +-
 misc/translator/po/fr-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-CA-opac-bootstrap.po         |    2 +-
 misc/translator/po/fr-CA-pref.po                   |  246 +-
 misc/translator/po/fr-CA-staff-help.po             |   15 +-
 misc/translator/po/fr-CA-staff-prog.po             |  348 +--
 misc/translator/po/fr-FR-marc-MARC21.po            |    2 +-
 misc/translator/po/fr-FR-marc-NORMARC.po           |    2 +-
 misc/translator/po/fr-FR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/fr-FR-opac-bootstrap.po         |   12 +-
 misc/translator/po/fr-FR-pref.po                   |  147 +-
 misc/translator/po/fr-FR-staff-help.po             |   39 +-
 misc/translator/po/fr-FR-staff-prog.po             |  504 ++-
 misc/translator/po/gl-marc-MARC21.po               |    2 +-
 misc/translator/po/gl-marc-NORMARC.po              |    2 +-
 misc/translator/po/gl-marc-UNIMARC.po              |    2 +-
 misc/translator/po/gl-opac-bootstrap.po            |    2 +-
 misc/translator/po/gl-staff-help.po                |   15 +-
 misc/translator/po/gl-staff-prog.po                |  279 +-
 misc/translator/po/he-Hebr-marc-MARC21.po          |    2 +-
 misc/translator/po/he-Hebr-marc-NORMARC.po         |    2 +-
 misc/translator/po/he-Hebr-marc-UNIMARC.po         |    2 +-
 misc/translator/po/he-Hebr-opac-bootstrap.po       |    2 +-
 misc/translator/po/he-Hebr-staff-help.po           |   15 +-
 misc/translator/po/he-Hebr-staff-prog.po           |  279 +-
 misc/translator/po/hi-marc-MARC21.po               |    2 +-
 misc/translator/po/hi-marc-NORMARC.po              |    2 +-
 misc/translator/po/hi-marc-UNIMARC.po              |    2 +-
 misc/translator/po/hi-opac-bootstrap.po            |   15 +-
 misc/translator/po/hi-pref.po                      |    8 +-
 misc/translator/po/hi-staff-help.po                |   25 +-
 misc/translator/po/hi-staff-prog.po                |  318 +-
 misc/translator/po/hr-HR-marc-MARC21.po            |    2 +-
 misc/translator/po/hr-HR-marc-NORMARC.po           |    2 +-
 misc/translator/po/hr-HR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hr-HR-opac-bootstrap.po         |    2 +-
 misc/translator/po/hr-HR-staff-help.po             |   15 +-
 misc/translator/po/hr-HR-staff-prog.po             |  284 +-
 misc/translator/po/hu-HU-marc-MARC21.po            |    2 +-
 misc/translator/po/hu-HU-marc-NORMARC.po           |    2 +-
 misc/translator/po/hu-HU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/hu-HU-opac-bootstrap.po         |    2 +-
 misc/translator/po/hu-HU-staff-help.po             |   15 +-
 misc/translator/po/hu-HU-staff-prog.po             |  279 +-
 misc/translator/po/hy-Armn-marc-MARC21.po          |   64 +-
 misc/translator/po/hy-Armn-marc-NORMARC.po         |    2 +-
 misc/translator/po/hy-Armn-marc-UNIMARC.po         |   18 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po       |   37 +-
 misc/translator/po/hy-Armn-staff-help.po           |   15 +-
 misc/translator/po/hy-Armn-staff-prog.po           |  288 +-
 misc/translator/po/ia-marc-MARC21.po               |    2 +-
 misc/translator/po/ia-marc-NORMARC.po              |    2 +-
 misc/translator/po/ia-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ia-opac-bootstrap.po            |    2 +-
 misc/translator/po/ia-staff-help.po                |   15 +-
 misc/translator/po/ia-staff-prog.po                |  279 +-
 misc/translator/po/id-ID-marc-MARC21.po            |    2 +-
 misc/translator/po/id-ID-marc-NORMARC.po           |    2 +-
 misc/translator/po/id-ID-marc-UNIMARC.po           |    2 +-
 misc/translator/po/id-ID-opac-bootstrap.po         |    2 +-
 misc/translator/po/id-ID-staff-help.po             |   15 +-
 misc/translator/po/id-ID-staff-prog.po             |  288 +-
 misc/translator/po/iq-CA-marc-MARC21.po            |    2 +-
 misc/translator/po/iq-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iq-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iq-CA-opac-bootstrap.po         |    2 +-
 misc/translator/po/iq-CA-staff-help.po             |   15 +-
 misc/translator/po/iq-CA-staff-prog.po             |  279 +-
 misc/translator/po/is-IS-marc-MARC21.po            |    2 +-
 misc/translator/po/is-IS-marc-NORMARC.po           |    2 +-
 misc/translator/po/is-IS-marc-UNIMARC.po           |    2 +-
 misc/translator/po/is-IS-opac-bootstrap.po         |    2 +-
 misc/translator/po/is-IS-staff-help.po             |   15 +-
 misc/translator/po/is-IS-staff-prog.po             |  279 +-
 misc/translator/po/it-IT-marc-MARC21.po            |    2 +-
 misc/translator/po/it-IT-marc-NORMARC.po           |    2 +-
 misc/translator/po/it-IT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/it-IT-opac-bootstrap.po         |   21 +-
 misc/translator/po/it-IT-pref.po                   |   19 +-
 misc/translator/po/it-IT-staff-help.po             |   22 +-
 misc/translator/po/it-IT-staff-prog.po             |  297 +-
 misc/translator/po/iu-CA-marc-MARC21.po            |    2 +-
 misc/translator/po/iu-CA-marc-NORMARC.po           |    2 +-
 misc/translator/po/iu-CA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/iu-CA-opac-bootstrap.po         |    2 +-
 misc/translator/po/iu-CA-staff-help.po             |   15 +-
 misc/translator/po/iu-CA-staff-prog.po             |  279 +-
 misc/translator/po/ja-Jpan-JP-marc-MARC21.po       |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |    2 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        |   15 +-
 misc/translator/po/ja-Jpan-JP-staff-prog.po        |  279 +-
 misc/translator/po/ka-marc-MARC21.po               |    2 +-
 misc/translator/po/ka-marc-NORMARC.po              |    2 +-
 misc/translator/po/ka-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ka-opac-bootstrap.po            |    2 +-
 misc/translator/po/ka-staff-help.po                |   15 +-
 misc/translator/po/ka-staff-prog.po                |  279 +-
 misc/translator/po/km-KH-marc-MARC21.po            |    2 +-
 misc/translator/po/km-KH-marc-NORMARC.po           |    2 +-
 misc/translator/po/km-KH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/km-KH-opac-bootstrap.po         |    2 +-
 misc/translator/po/km-KH-staff-help.po             |   15 +-
 misc/translator/po/km-KH-staff-prog.po             |  279 +-
 misc/translator/po/kn-Knda-marc-MARC21.po          |    2 +-
 misc/translator/po/kn-Knda-marc-NORMARC.po         |    2 +-
 misc/translator/po/kn-Knda-marc-UNIMARC.po         |    2 +-
 misc/translator/po/kn-Knda-opac-bootstrap.po       |    2 +-
 misc/translator/po/kn-Knda-staff-help.po           |   15 +-
 misc/translator/po/kn-Knda-staff-prog.po           |  279 +-
 misc/translator/po/ko-Kore-KP-marc-MARC21.po       |    2 +-
 misc/translator/po/ko-Kore-KP-marc-NORMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-marc-UNIMARC.po      |    2 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |    2 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        |   15 +-
 misc/translator/po/ko-Kore-KP-staff-prog.po        |  286 +-
 misc/translator/po/ku-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ku-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ku-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ku-Arab-opac-bootstrap.po       |    2 +-
 misc/translator/po/ku-Arab-staff-help.po           |   15 +-
 misc/translator/po/ku-Arab-staff-prog.po           |  279 +-
 misc/translator/po/lo-Laoo-marc-MARC21.po          |    2 +-
 misc/translator/po/lo-Laoo-marc-NORMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-marc-UNIMARC.po         |    2 +-
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |    2 +-
 misc/translator/po/lo-Laoo-staff-help.po           |   15 +-
 misc/translator/po/lo-Laoo-staff-prog.po           |  282 +-
 misc/translator/po/mi-NZ-marc-MARC21.po            |    2 +-
 misc/translator/po/mi-NZ-marc-NORMARC.po           |    2 +-
 misc/translator/po/mi-NZ-marc-UNIMARC.po           |    2 +-
 misc/translator/po/mi-NZ-opac-bootstrap.po         |    2 +-
 misc/translator/po/mi-NZ-staff-help.po             |   15 +-
 misc/translator/po/mi-NZ-staff-prog.po             |  279 +-
 misc/translator/po/ml-marc-MARC21.po               |    2 +-
 misc/translator/po/ml-marc-NORMARC.po              |    2 +-
 misc/translator/po/ml-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ml-opac-bootstrap.po            |    2 +-
 misc/translator/po/ml-staff-help.po                |   15 +-
 misc/translator/po/ml-staff-prog.po                |  279 +-
 misc/translator/po/mon-marc-MARC21.po              |    2 +-
 misc/translator/po/mon-marc-NORMARC.po             |    2 +-
 misc/translator/po/mon-marc-UNIMARC.po             |    2 +-
 misc/translator/po/mon-opac-bootstrap.po           |    2 +-
 misc/translator/po/mon-staff-help.po               |   15 +-
 misc/translator/po/mon-staff-prog.po               |  279 +-
 misc/translator/po/mr-marc-MARC21.po               |    2 +-
 misc/translator/po/mr-marc-NORMARC.po              |    2 +-
 misc/translator/po/mr-marc-UNIMARC.po              |    2 +-
 misc/translator/po/mr-opac-bootstrap.po            |    2 +-
 misc/translator/po/mr-staff-help.po                |   15 +-
 misc/translator/po/mr-staff-prog.po                |  282 +-
 misc/translator/po/ms-MY-marc-MARC21.po            |    2 +-
 misc/translator/po/ms-MY-marc-NORMARC.po           |    2 +-
 misc/translator/po/ms-MY-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ms-MY-opac-bootstrap.po         |    2 +-
 misc/translator/po/ms-MY-staff-help.po             |   15 +-
 misc/translator/po/ms-MY-staff-prog.po             |  282 +-
 misc/translator/po/my-marc-MARC21.po               |    2 +-
 misc/translator/po/my-marc-NORMARC.po              |    2 +-
 misc/translator/po/my-marc-UNIMARC.po              |    2 +-
 misc/translator/po/my-opac-bootstrap.po            |    2 +-
 misc/translator/po/my-staff-help.po                |   15 +-
 misc/translator/po/my-staff-prog.po                |  279 +-
 misc/translator/po/nb-NO-marc-MARC21.po            |    2 +-
 misc/translator/po/nb-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nb-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nb-NO-opac-bootstrap.po         |    2 +-
 misc/translator/po/nb-NO-staff-help.po             |   15 +-
 misc/translator/po/nb-NO-staff-prog.po             |  288 +-
 misc/translator/po/ne-NE-marc-MARC21.po            |    2 +-
 misc/translator/po/ne-NE-marc-NORMARC.po           |    2 +-
 misc/translator/po/ne-NE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ne-NE-opac-bootstrap.po         |    2 +-
 misc/translator/po/ne-NE-staff-help.po             |   15 +-
 misc/translator/po/ne-NE-staff-prog.po             |  279 +-
 misc/translator/po/nl-BE-marc-MARC21.po            | 3213 ++++++++++----------
 misc/translator/po/nl-BE-marc-NORMARC.po           |  208 +-
 misc/translator/po/nl-BE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-BE-opac-bootstrap.po         |    2 +-
 misc/translator/po/nl-BE-staff-help.po             |   15 +-
 misc/translator/po/nl-BE-staff-prog.po             |  282 +-
 misc/translator/po/nl-NL-marc-MARC21.po            |    2 +-
 misc/translator/po/nl-NL-marc-NORMARC.po           |    2 +-
 misc/translator/po/nl-NL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nl-NL-opac-bootstrap.po         |    2 +-
 misc/translator/po/nl-NL-staff-help.po             |   15 +-
 misc/translator/po/nl-NL-staff-prog.po             |  282 +-
 misc/translator/po/nn-NO-marc-MARC21.po            |    2 +-
 misc/translator/po/nn-NO-marc-NORMARC.po           |    2 +-
 misc/translator/po/nn-NO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/nn-NO-opac-bootstrap.po         |    2 +-
 misc/translator/po/nn-NO-staff-help.po             |   15 +-
 misc/translator/po/nn-NO-staff-prog.po             |  279 +-
 misc/translator/po/oc-marc-MARC21.po               |    2 +-
 misc/translator/po/oc-marc-NORMARC.po              |    2 +-
 misc/translator/po/oc-marc-UNIMARC.po              |    2 +-
 misc/translator/po/oc-opac-bootstrap.po            |    2 +-
 misc/translator/po/oc-staff-help.po                |   15 +-
 misc/translator/po/oc-staff-prog.po                |  288 +-
 misc/translator/po/pbr-marc-MARC21.po              |    2 +-
 misc/translator/po/pbr-marc-NORMARC.po             |    2 +-
 misc/translator/po/pbr-marc-UNIMARC.po             |    2 +-
 misc/translator/po/pbr-opac-bootstrap.po           |    2 +-
 misc/translator/po/pbr-staff-help.po               |   15 +-
 misc/translator/po/pbr-staff-prog.po               |  279 +-
 misc/translator/po/pl-PL-marc-MARC21.po            |    2 +-
 misc/translator/po/pl-PL-marc-NORMARC.po           |    2 +-
 misc/translator/po/pl-PL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pl-PL-opac-bootstrap.po         |    2 +-
 misc/translator/po/pl-PL-pref.po                   |   12 +-
 misc/translator/po/pl-PL-staff-help.po             |   19 +-
 misc/translator/po/pl-PL-staff-prog.po             |  293 +-
 misc/translator/po/prs-marc-MARC21.po              |    2 +-
 misc/translator/po/prs-marc-NORMARC.po             |    2 +-
 misc/translator/po/prs-marc-UNIMARC.po             |    2 +-
 misc/translator/po/prs-opac-bootstrap.po           |    2 +-
 misc/translator/po/prs-staff-help.po               |   15 +-
 misc/translator/po/prs-staff-prog.po               |  282 +-
 misc/translator/po/pt-BR-marc-MARC21.po            |    2 +-
 misc/translator/po/pt-BR-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-BR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-BR-opac-bootstrap.po         |    2 +-
 misc/translator/po/pt-BR-staff-help.po             |   15 +-
 misc/translator/po/pt-BR-staff-prog.po             |  288 +-
 misc/translator/po/pt-PT-marc-MARC21.po            |    2 +-
 misc/translator/po/pt-PT-marc-NORMARC.po           |    2 +-
 misc/translator/po/pt-PT-marc-UNIMARC.po           |    2 +-
 misc/translator/po/pt-PT-opac-bootstrap.po         |   20 +-
 misc/translator/po/pt-PT-pref.po                   |   12 +-
 misc/translator/po/pt-PT-staff-help.po             |   31 +-
 misc/translator/po/pt-PT-staff-prog.po             |  339 +--
 misc/translator/po/ro-RO-marc-MARC21.po            |    2 +-
 misc/translator/po/ro-RO-marc-NORMARC.po           |    2 +-
 misc/translator/po/ro-RO-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ro-RO-opac-bootstrap.po         |    2 +-
 misc/translator/po/ro-RO-staff-help.po             |   15 +-
 misc/translator/po/ro-RO-staff-prog.po             |  279 +-
 misc/translator/po/ru-RU-marc-MARC21.po            |    2 +-
 misc/translator/po/ru-RU-marc-NORMARC.po           |    2 +-
 misc/translator/po/ru-RU-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ru-RU-opac-bootstrap.po         |    2 +-
 misc/translator/po/ru-RU-staff-help.po             |   15 +-
 misc/translator/po/ru-RU-staff-prog.po             |  281 +-
 misc/translator/po/rw-RW-marc-MARC21.po            |    2 +-
 misc/translator/po/rw-RW-marc-NORMARC.po           |    2 +-
 misc/translator/po/rw-RW-marc-UNIMARC.po           |    2 +-
 misc/translator/po/rw-RW-opac-bootstrap.po         |    2 +-
 misc/translator/po/rw-RW-staff-help.po             |   15 +-
 misc/translator/po/rw-RW-staff-prog.po             |  279 +-
 misc/translator/po/sd-PK-marc-MARC21.po            |    2 +-
 misc/translator/po/sd-PK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sd-PK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sd-PK-opac-bootstrap.po         |    2 +-
 misc/translator/po/sd-PK-staff-help.po             |   15 +-
 misc/translator/po/sd-PK-staff-prog.po             |  282 +-
 misc/translator/po/sk-SK-marc-MARC21.po            |    2 +-
 misc/translator/po/sk-SK-marc-NORMARC.po           |    2 +-
 misc/translator/po/sk-SK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sk-SK-opac-bootstrap.po         |    8 +-
 misc/translator/po/sk-SK-staff-help.po             |   16 +-
 misc/translator/po/sk-SK-staff-prog.po             |  474 +--
 misc/translator/po/sl-SI-marc-MARC21.po            |    2 +-
 misc/translator/po/sl-SI-marc-NORMARC.po           |    2 +-
 misc/translator/po/sl-SI-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sl-SI-opac-bootstrap.po         |    2 +-
 misc/translator/po/sl-SI-staff-help.po             |   15 +-
 misc/translator/po/sl-SI-staff-prog.po             |  279 +-
 misc/translator/po/sq-AL-marc-MARC21.po            |    2 +-
 misc/translator/po/sq-AL-marc-NORMARC.po           |    2 +-
 misc/translator/po/sq-AL-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sq-AL-opac-bootstrap.po         |    2 +-
 misc/translator/po/sq-AL-staff-help.po             |   15 +-
 misc/translator/po/sq-AL-staff-prog.po             |  288 +-
 misc/translator/po/sr-Cyrl-marc-MARC21.po          |    2 +-
 misc/translator/po/sr-Cyrl-marc-NORMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-marc-UNIMARC.po         |    2 +-
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |    2 +-
 misc/translator/po/sr-Cyrl-staff-help.po           |   15 +-
 misc/translator/po/sr-Cyrl-staff-prog.po           |  282 +-
 misc/translator/po/sv-SE-marc-MARC21.po            |    2 +-
 misc/translator/po/sv-SE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sv-SE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sv-SE-opac-bootstrap.po         |    2 +-
 misc/translator/po/sv-SE-pref.po                   |    9 +-
 misc/translator/po/sv-SE-staff-help.po             |   15 +-
 misc/translator/po/sv-SE-staff-prog.po             |  288 +-
 misc/translator/po/sw-KE-marc-MARC21.po            |    2 +-
 misc/translator/po/sw-KE-marc-NORMARC.po           |    2 +-
 misc/translator/po/sw-KE-marc-UNIMARC.po           |    2 +-
 misc/translator/po/sw-KE-opac-bootstrap.po         |    2 +-
 misc/translator/po/sw-KE-staff-help.po             |   15 +-
 misc/translator/po/sw-KE-staff-prog.po             |  279 +-
 misc/translator/po/ta-LK-marc-MARC21.po            |    2 +-
 misc/translator/po/ta-LK-marc-NORMARC.po           |    2 +-
 misc/translator/po/ta-LK-marc-UNIMARC.po           |    2 +-
 misc/translator/po/ta-LK-opac-bootstrap.po         |    2 +-
 misc/translator/po/ta-LK-staff-help.po             |   15 +-
 misc/translator/po/ta-LK-staff-prog.po             |  279 +-
 misc/translator/po/ta-marc-MARC21.po               |    2 +-
 misc/translator/po/ta-marc-NORMARC.po              |    2 +-
 misc/translator/po/ta-marc-UNIMARC.po              |    2 +-
 misc/translator/po/ta-opac-bootstrap.po            |    2 +-
 misc/translator/po/ta-staff-help.po                |   15 +-
 misc/translator/po/ta-staff-prog.po                |  279 +-
 misc/translator/po/tet-marc-MARC21.po              |    2 +-
 misc/translator/po/tet-marc-NORMARC.po             |    2 +-
 misc/translator/po/tet-marc-UNIMARC.po             |    2 +-
 misc/translator/po/tet-opac-bootstrap.po           |    2 +-
 misc/translator/po/tet-staff-help.po               |   15 +-
 misc/translator/po/tet-staff-prog.po               |  288 +-
 misc/translator/po/th-TH-marc-MARC21.po            |    2 +-
 misc/translator/po/th-TH-marc-NORMARC.po           |    2 +-
 misc/translator/po/th-TH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/th-TH-opac-bootstrap.po         |    2 +-
 misc/translator/po/th-TH-staff-help.po             |   15 +-
 misc/translator/po/th-TH-staff-prog.po             |  282 +-
 misc/translator/po/tl-PH-marc-MARC21.po            |    2 +-
 misc/translator/po/tl-PH-marc-NORMARC.po           |    2 +-
 misc/translator/po/tl-PH-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tl-PH-opac-bootstrap.po         |    2 +-
 misc/translator/po/tl-PH-staff-help.po             |   15 +-
 misc/translator/po/tl-PH-staff-prog.po             |  282 +-
 misc/translator/po/tr-TR-marc-MARC21.po            |   28 +-
 misc/translator/po/tr-TR-marc-NORMARC.po           |    2 +-
 misc/translator/po/tr-TR-marc-UNIMARC.po           |    2 +-
 misc/translator/po/tr-TR-opac-bootstrap.po         |    2 +-
 misc/translator/po/tr-TR-pref.po                   |   18 +-
 misc/translator/po/tr-TR-staff-help.po             |  295 +-
 misc/translator/po/tr-TR-staff-prog.po             |  297 +-
 misc/translator/po/uk-UA-marc-MARC21.po            |  117 +-
 misc/translator/po/uk-UA-marc-NORMARC.po           |    2 +-
 misc/translator/po/uk-UA-marc-UNIMARC.po           |    2 +-
 misc/translator/po/uk-UA-opac-bootstrap.po         |   85 +-
 misc/translator/po/uk-UA-pref.po                   |   40 +-
 misc/translator/po/uk-UA-staff-help.po             |   47 +-
 misc/translator/po/uk-UA-staff-prog.po             | 1417 +++++----
 misc/translator/po/ur-Arab-marc-MARC21.po          |    2 +-
 misc/translator/po/ur-Arab-marc-NORMARC.po         |    2 +-
 misc/translator/po/ur-Arab-marc-UNIMARC.po         |    2 +-
 misc/translator/po/ur-Arab-opac-bootstrap.po       |    2 +-
 misc/translator/po/ur-Arab-staff-help.po           |   15 +-
 misc/translator/po/ur-Arab-staff-prog.po           |  279 +-
 misc/translator/po/vi-VN-marc-MARC21.po            |    2 +-
 misc/translator/po/vi-VN-marc-NORMARC.po           |    2 +-
 misc/translator/po/vi-VN-marc-UNIMARC.po           |    2 +-
 misc/translator/po/vi-VN-opac-bootstrap.po         |    2 +-
 misc/translator/po/vi-VN-staff-help.po             |   15 +-
 misc/translator/po/vi-VN-staff-prog.po             |  286 +-
 misc/translator/po/zh-Hans-CN-marc-MARC21.po       |    2 +-
 misc/translator/po/zh-Hans-CN-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    |    2 +-
 misc/translator/po/zh-Hans-CN-staff-help.po        |   15 +-
 misc/translator/po/zh-Hans-CN-staff-prog.po        |  286 +-
 misc/translator/po/zh-Hans-TW-marc-MARC21.po       |    2 +-
 misc/translator/po/zh-Hans-TW-marc-NORMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-marc-UNIMARC.po      |    2 +-
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |    2 +-
 misc/translator/po/zh-Hans-TW-pref.po              |   15 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        |   19 +-
 misc/translator/po/zh-Hans-TW-staff-prog.po        |  293 +-
 reports/reserves_stats.pl                          |   18 +-
 t/Installer_PerlModules.t                          |   14 +-
 t/db_dependent/Auth_with_ldap.t                    |   33 +-
 t/db_dependent/Authorities/Merge.t                 |  288 ++
 t/db_dependent/Search.t                            |    3 +
 t/db_dependent/Sitemapper.t                        |    2 +-
 t/db_dependent/check_sysprefs.t                    |   11 +-
 xt/sample_notices.t                                |    1 +
 528 files changed, 17616 insertions(+), 16745 deletions(-)
 create mode 100755 t/db_dependent/Authorities/Merge.t


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list