[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-28-ga663e9f

[Git repo owner]

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, 3.14.x has been updated
       via  a663e9fb3d024d3165a7edbc660d7c77a977f7a1 (commit)
       via  069b6e62e5c491db1630e8bbbed7e17fd90aa86d (commit)
      from  04f5eb91e15f1b8c89ff8f666256318d583ec634 (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 a663e9fb3d024d3165a7edbc660d7c77a977f7a1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Mar 1 09:33:27 2014 +0100

    Bug 11828: (follow-up) add new option to OrderPdfFormat
    
    To test:
    - Check appearance of the OrderPdfFormat system preference
      It will offer a pull down with options, including
      "German 2-page"
    
    Followed test plan. Patch behaves as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    
    (cherry picked from commit 6372689f5dc7f0e9d34ffef3ad0c2a1ab6d6fb58)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 069b6e62e5c491db1630e8bbbed7e17fd90aa86d
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Wed Feb 26 17:50:10 2014 +0100

    Bug 11828: Add German translation of layout2pages PDF template
    
    To test:
    - Switch system preference OrderPdfFormat to pdfformat::layout2pagesde
    - Create one or more baskets with some orders each.
    - Add all baskets to one basket group
    - Print the basket group
    - Check everything is translated into German and the formatting/layout
      looks ok
    
    Followed test plan and compared English with German printout.
    German version is OK.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit ffeb666994327b97e26bc372fd574d05a40e8336)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 acqui/basketgroup.pl                                         |    3 ++-
 acqui/pdfformat/{layout2pages.pm => layout2pagesde.pm}       |   10 +++++-----
 .../prog/en/modules/admin/preferences/acquisitions.pref      |    1 +
 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.odt          |  Bin 0 -> 12696 bytes
 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.pdf          |  Bin 0 -> 23158 bytes
 5 files changed, 8 insertions(+), 6 deletions(-)
 copy acqui/pdfformat/{layout2pages.pm => layout2pagesde.pm} (95%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.odt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.pdf


hooks/post-receive
-- 
main Koha release repository