@@ -, +, @@ --- .../tools/automatic_item_modification_by_age.tt | 4 ++-- .../prog/en/modules/tools/csv-profiles.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/tools/export.tt | 2 ++ .../intranet-tmpl/prog/en/modules/tools/holidays.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/koha-news.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/tools/picture-upload.tt | 6 +++--- .../prog/en/modules/tools/preview_letter.tt | 1 + .../prog/en/modules/tools/quotes-upload.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/tools/scheduler.tt | 2 ++ .../prog/en/modules/tools/showdiffmarc.tt | 5 +++-- .../prog/en/modules/tools/stockrotation.tt | 20 ++++++++++---------- .../prog/en/modules/tools/tools-home.tt | 1 + .../en/modules/virtualshelves/addbybiblionumber.tt | 1 + .../prog/en/modules/virtualshelves/downloadshelf.tt | 2 +- .../prog/en/modules/virtualshelves/sendshelfform.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 9 ++++----- 18 files changed, 40 insertions(+), 33 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt @@ -45,7 +45,7 @@ [% IF ( op == 'edit_form' ) %]
-

Rules for automatic item modifications by age

+

Rules for automatic item modifications by age

@@ -58,7 +58,7 @@
[% ELSE %] -

Automatic item modifications by age

+

Automatic item modifications by age

[% IF ( rules ) %]
Edit rules --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt @@ -269,7 +269,7 @@ [% IF op == 'delete_confirm' %]
[% IF csv_profile %] -

Delete CSV Profile "[% csv_profile.profile | html %]?"

+

Delete CSV Profile "[% csv_profile.profile | html %]?"

@@ -290,7 +290,7 @@ New CSV profile
-

CSV profiles

+

CSV profiles

[% IF csv_profiles %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -37,6 +37,8 @@
+

Export data

+ [% FOR m IN messages %]
[% SWITCH m.code %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt @@ -32,7 +32,7 @@
-

[% Branches.GetName( branch ) | html %] calendar

+

[% Branches.GetName( branch ) | html %] calendar

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt @@ -68,11 +68,11 @@ [% END %]
+

News

[% UNLESS ( add_form ) %] [% IF error_message == 'title_missing' %]
Error: Required news title missing!
[% END %] -

News

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -536,7 +536,7 @@ [% IF ( delete_confirm ) %]
-

Delete notice?

+

Delete notice?

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -48,16 +48,16 @@ [% IF ( ERRORS ) %] [% IF ( TCOUNTS ) %]
-

Patron image(s) uploaded with some errors

+

Patron image(s) uploaded with some errors

[% ELSE %]
-

Patron image failed to upload

+

Patron image failed to upload

[% END %] [% ELSE %]
-

Patron image(s) successfully uploaded

+

Patron image(s) successfully uploaded

[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tt @@ -31,6 +31,8 @@
+

Task scheduler

+ [% IF ( job_add_failed ) %]
Failed to add scheduled task
[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt @@ -41,9 +41,10 @@
+

Compare matched records

-

Original

+

Original

[% IF ( ERROR_FORMATTED1 ) %]

The record id [% RECORDID | html %] doesn't match any existing record.

@@ -54,7 +55,7 @@ [% END %]
-

Imported

+

Imported

[% IF ( ERROR_FORMATTED2 ) %]

The import id number [% IMPORTID | html %] doesn't match any existing record.

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt @@ -95,7 +95,7 @@ [% INCLUDE 'stockrotation-toolbar.inc' %] -

Stock rotation

+

Stock rotation

[% IF existing_rotas.size > 0 %]
@@ -152,9 +152,9 @@ [% ELSIF (op == 'create_edit_rota') %] [% IF rota.rota_id %] -

Edit "[% rota.title | html %]"

+

Edit "[% rota.title | html %]"

[% ELSE %] -

Create new rota

+

Create new rota

[% END %] [% IF error == 'invalid_form' %] @@ -209,7 +209,7 @@ [% END %] -

Manage [% rota.title | html %] stages

+

Manage [% rota.title | html %] stages

Edit "[% Branches.GetName(stage.branchcode_id) | html %]" +

Edit "[% Branches.GetName(stage.branchcode_id) | html %]"

[% ELSE %] -

Create new stage

+

Create new stage

[% END %] [% IF error == 'invalid_form' %] @@ -357,7 +357,7 @@ [% ELSIF (op == 'confirm_remove_from_rota') %]
-

Are you sure you wish to remove this item from it's rota

+

Are you sure you wish to remove this item from it's rota

Yes No @@ -366,7 +366,7 @@ [% ELSIF (op == 'confirm_delete_stage') %]

-

Are you sure you want to delete this stage?

+

Are you sure you want to delete this stage?

[% IF stage.stockrotationitems.count > 0 %]

This stage contains the following item(s):

    @@ -394,7 +394,7 @@
[% END %] -

Manage items assigned to [% rota.title | html %]

+

Manage items assigned to [% rota.title | html %]