@@ -, +, @@ --- C4/Labels/Label.pm | 6 +++--- C4/Record.pm | 2 +- etc/zebradb/ccl.properties | 2 +- installer/data/mysql/kohastructure.sql | 4 ++-- .../intranet-tmpl/prog/en/js/tinymce/changelog | 4 ++-- .../themes/advanced/css/editor_content.css | 2 +- .../prog/en/lib/yui/calendar/calendar-debug.js | 2 +- .../prog/en/lib/yui/calendar/calendar.js | 2 +- .../prog/en/lib/yui/dragdrop/dragdrop-debug.js | 2 +- .../prog/en/lib/yui/dragdrop/dragdrop.js | 2 +- .../prog/en/lib/yui/editor/editor-debug.js | 2 +- .../intranet-tmpl/prog/en/lib/yui/editor/editor.js | 2 +- .../prog/en/lib/yui/editor/simpleeditor-debug.js | 2 +- .../prog/en/lib/yui/editor/simpleeditor.js | 2 +- .../intranet-tmpl/prog/en/lib/yui/get/get-debug.js | 2 +- koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get.js | 2 +- .../prog/en/lib/yui/menu/menu-debug.js | 4 ++-- .../intranet-tmpl/prog/en/lib/yui/menu/menu.js | 4 ++-- .../prog/en/lib/yui/yahoo/yahoo-debug.js | 2 +- .../intranet-tmpl/prog/en/lib/yui/yahoo/yahoo.js | 2 +- .../prog/en/lib/yui/yuiloader/yuiloader-debug.js | 6 +++--- .../prog/en/lib/yui/yuiloader/yuiloader.js | 6 +++--- .../en/modules/help/tools/manage-marc-import.tt | 2 +- .../prog/en/modules/help/tools/overduerules.tt | 2 +- .../prog/en/modules/help/tools/picture-upload.tt | 4 ++-- .../prog/en/modules/help/tools/scheduler.tt | 4 ++-- 26 files changed, 38 insertions(+), 38 deletions(-) --- a/C4/Labels/Label.pm +++ a/C4/Labels/Label.pm @@ -273,7 +273,7 @@ sub _BIB { sub _BAR { my $self = shift; - my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'}; # this places the bottom left of the barcode the left text margin distance to right of the the left edge of the label ($llx) + my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'}; # this places the bottom left of the barcode the left text margin distance to right of the left edge of the label ($llx) my $barcode_lly = $self->{'lly'} + $self->{'top_text_margin'}; # this places the bottom left of the barcode the top text margin distance above the bottom of the label ($lly) my $barcode_width = 0.8 * $self->{'width'}; # this scales the barcode width to 80% of the label width my $barcode_y_scale_factor = 0.01 * $self->{'height'}; # this scales the barcode height to 10% of the label height @@ -282,7 +282,7 @@ sub _BAR { sub _BIBBAR { my $self = shift; - my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'}; # this places the bottom left of the barcode the left text margin distance to right of the the left edge of the label ($self->{'llx'}) + my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'}; # this places the bottom left of the barcode the left text margin distance to right of the left edge of the label ($self->{'llx'}) my $barcode_lly = $self->{'lly'} + $self->{'top_text_margin'}; # this places the bottom left of the barcode the top text margin distance above the bottom of the label ($lly) my $barcode_width = 0.8 * $self->{'width'}; # this scales the barcode width to 80% of the label width my $barcode_y_scale_factor = 0.01 * $self->{'height'}; # this scales the barcode height to 10% of the label height @@ -294,7 +294,7 @@ sub _BIBBAR { sub _BARBIB { my $self = shift; - my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'}; # this places the bottom left of the barcode the left text margin distance to right of the the left edge of the label ($self->{'llx'}) + my $barcode_llx = $self->{'llx'} + $self->{'left_text_margin'}; # this places the bottom left of the barcode the left text margin distance to right of the left edge of the label ($self->{'llx'}) my $barcode_lly = ($self->{'lly'} + $self->{'height'}) - $self->{'top_text_margin'}; # this places the bottom left of the barcode the top text margin distance below the top of the label ($self->{'lly'}) my $barcode_width = 0.8 * $self->{'width'}; # this scales the barcode width to 80% of the label width my $barcode_y_scale_factor = 0.01 * $self->{'height'}; # this scales the barcode height to 10% of the label height --- a/C4/Record.pm +++ a/C4/Record.pm @@ -398,7 +398,7 @@ sub marcrecord2csv { # Getting the marcfields as an array my @marcfieldsarray = split('\|', $marcfieldslist); - # Separating the marcfields from the the user-supplied headers + # Separating the marcfields from the user-supplied headers my @marcfields; foreach (@marcfieldsarray) { my @result = split('=', $_); --- a/etc/zebradb/ccl.properties +++ a/etc/zebradb/ccl.properties @@ -831,7 +831,7 @@ Title-uniform-heading 1=Title-uniform-heading Title-uniform-see 1=Title-uniform-see Title-uniform-seealso 1=Title-uniform-seealso -#Authority-number Koha-Auth-Number The identifier of the the authority +#Authority-number Koha-Auth-Number The identifier of the authority # record, stored in 001 in the authority record, and $9/$0 in the # field that record is linked to in the bib record Authority-Number 1=Koha-Auth-Number --- a/installer/data/mysql/kohastructure.sql +++ a/installer/data/mysql/kohastructure.sql @@ -1393,7 +1393,7 @@ CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b `cancellationdate` date default NULL, -- the date this hold was cancelled `reservenotes` mediumtext, -- notes related to this hold `priority` smallint(6) default NULL, -- where in the queue the patron sits - `found` varchar(1) default NULL, -- a one letter code defining what the the status is of the hold is after it has been confirmed + `found` varchar(1) default NULL, -- a one letter code defining what the status is of the hold is after it has been confirmed `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with `waitingdate` date default NULL, -- the date the item was marked as waiting for the patron at the library @@ -1568,7 +1568,7 @@ CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha `cancellationdate` date default NULL, -- the date this hold was cancelled `reservenotes` mediumtext, -- notes related to this hold `priority` smallint(6) default NULL, -- where in the queue the patron sits - `found` varchar(1) default NULL, -- a one letter code defining what the the status is of the hold is after it has been confirmed + `found` varchar(1) default NULL, -- a one letter code defining what the status is of the hold is after it has been confirmed `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this hold was last updated `itemnumber` int(11) default NULL, -- foreign key from the items table defining the specific item the patron has placed on hold or the item this hold was filled with `waitingdate` date default NULL, -- the date the item was marked as waiting for the patron at the library --- a/koha-tmpl/intranet-tmpl/prog/en/js/tinymce/changelog +++ a/koha-tmpl/intranet-tmpl/prog/en/js/tinymce/changelog @@ -243,7 +243,7 @@ Version 2.0.6 (2006-05-03) Added new CSS style properties support, this was as a plugin called style. Fixed bug where TinyMCE was reporting a warning when inserting a image while running on HTTPS. Fixed bug where pressing the browser back button after submit removed empty paragraphs in MSIE. - Fixed bug where links the the same page as the editor page was converted into a /. + Fixed bug where links the same page as the editor page was converted into a /. Fixed bug where the getSelectedHTML method was returning undefined when selecting controls in MSIE. Fixed bug with unterminated string literal errors where reported in some browsers. Fixed bug where src and href where converted into xsrc and xhref in text. @@ -728,7 +728,7 @@ Version 1.45 RC1 (2005-05-27) Fixed so the contextmenu plugin uses images from the configurated theme instead of the advanced theme. Fixed so the external_link_list_url/external_image_list_url options can use relative or absolute path. Fixed so the external_link_list_url/external_image_list_url has a random query parameter to prevent it from cache. - Added new mceInsertRawHTML command, this inserts raw as it is HTML code in the the selected position. + Added new mceInsertRawHTML command, this inserts raw as it is HTML code in the selected position. Added paste plain text plugin contributed by Ryan Demmer, converted it into a paste plugin. Added updated paste plugin contributed by speednet, includes paste directly feature for MSIE. Added split/merge table cells support, to table plugin and context menus. --- a/koha-tmpl/intranet-tmpl/prog/en/js/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_content.css +++ a/koha-tmpl/intranet-tmpl/prog/en/js/tinymce/jscripts/tiny_mce/themes/advanced/css/editor_content.css @@ -1,5 +1,5 @@ /* This file contains the CSS data for the editable area(iframe) of TinyMCE */ -/* You can extend this CSS by adding your own CSS file with the the content_css option */ +/* You can extend this CSS by adding your own CSS file with the content_css option */ body, td, pre { font-family: Verdana, Arial, Helvetica, sans-serif; --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/calendar/calendar-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/calendar/calendar-debug.js @@ -2446,7 +2446,7 @@ Calendar.prototype = { *

*

* This property can also be set to an object literal containing configuration properties for the CalendarNavigator UI. - * The configuration object expects the the following case-sensitive properties, with the "strings" property being a nested object. + * The configuration object expects the following case-sensitive properties, with the "strings" property being a nested object. * Any properties which are not provided will use the default values (defined in the CalendarNavigator class). *

*
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/calendar/calendar.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/calendar/calendar.js @@ -2436,7 +2436,7 @@ Calendar.prototype = { *

*

* This property can also be set to an object literal containing configuration properties for the CalendarNavigator UI. - * The configuration object expects the the following case-sensitive properties, with the "strings" property being a nested object. + * The configuration object expects the following case-sensitive properties, with the "strings" property being a nested object. * Any properties which are not provided will use the default values (defined in the CalendarNavigator class). *

*
--- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop-debug.js @@ -245,7 +245,7 @@ YAHOO.util.DragDropMgr = function() { locked: false, /** - * Provides additional information about the the current set of + * Provides additional information about the current set of * interactions. Can be accessed from the event handlers. It * contains the following properties: * --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/dragdrop/dragdrop.js @@ -241,7 +241,7 @@ YAHOO.util.DragDropMgr = function() { locked: false, /** - * Provides additional information about the the current set of + * Provides additional information about the current set of * interactions. Can be accessed from the event handlers. It * contains the following properties: * --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/editor-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/editor-debug.js @@ -953,7 +953,7 @@ var Dom = YAHOO.util.Dom, /** * @attribute collapse - * @description Boolean indicating if the the titlebar should have a collapse button. + * @description Boolean indicating if the titlebar should have a collapse button. * The collapse button will not remove the toolbar, it will minimize it to the titlebar * @default false * @type Boolean --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/editor.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/editor.js @@ -944,7 +944,7 @@ var Dom = YAHOO.util.Dom, /** * @attribute collapse - * @description Boolean indicating if the the titlebar should have a collapse button. + * @description Boolean indicating if the titlebar should have a collapse button. * The collapse button will not remove the toolbar, it will minimize it to the titlebar * @default false * @type Boolean --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/simpleeditor-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/simpleeditor-debug.js @@ -953,7 +953,7 @@ var Dom = YAHOO.util.Dom, /** * @attribute collapse - * @description Boolean indicating if the the titlebar should have a collapse button. + * @description Boolean indicating if the titlebar should have a collapse button. * The collapse button will not remove the toolbar, it will minimize it to the titlebar * @default false * @type Boolean --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/simpleeditor.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/editor/simpleeditor.js @@ -944,7 +944,7 @@ var Dom = YAHOO.util.Dom, /** * @attribute collapse - * @description Boolean indicating if the the titlebar should have a collapse button. + * @description Boolean indicating if the titlebar should have a collapse button. * The collapse button will not remove the toolbar, it will minimize it to the titlebar * @default false * @type Boolean --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get-debug.js @@ -562,7 +562,7 @@ YAHOO.util.Get = function() { TIMEOUT: 2000, /** - * Called by the the helper for detecting script load in Safari + * Called by the helper for detecting script load in Safari * @method _finalize * @param id {string} the transaction id * @private --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get.js @@ -549,7 +549,7 @@ YAHOO.util.Get = function() { TIMEOUT: 2000, /** - * Called by the the helper for detecting script load in Safari + * Called by the helper for detecting script load in Safari * @method _finalize * @param id {string} the transaction id * @private --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu-debug.js @@ -2385,7 +2385,7 @@ _subscribeToItemEvents: function (p_oItem) { /** * @method _onVisibleChange -* @description Change event handler for the the menu's "visible" configuration +* @description Change event handler for the menu's "visible" configuration * property. * @private * @param {String} p_sType String representing the name of the event that @@ -4852,7 +4852,7 @@ _setScrollHeight: function (p_nScrollHeight) { /* - Only clear the the "width" configuration property if it was set the + Only clear the "width" configuration property if it was set the "_setScrollHeight" method and wasn't changed by some other means after it was set. */ --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu/menu.js @@ -2350,7 +2350,7 @@ _subscribeToItemEvents: function (p_oItem) { /** * @method _onVisibleChange -* @description Change event handler for the the menu's "visible" configuration +* @description Change event handler for the menu's "visible" configuration * property. * @private * @param {String} p_sType String representing the name of the event that @@ -4811,7 +4811,7 @@ _setScrollHeight: function (p_nScrollHeight) { /* - Only clear the the "width" configuration property if it was set the + Only clear the "width" configuration property if it was set the "_setScrollHeight" method and wasn't changed by some other means after it was set. */ --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo/yahoo-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo/yahoo-debug.js @@ -128,7 +128,7 @@ YAHOO.namespace = function() { * @param {String} cat The log category for the message. Default * categories are "info", "warn", "error", time". * Custom categories can be used as well. (opt) - * @param {String} src The source of the the message (opt) + * @param {String} src The source of the message (opt) * @return {Boolean} True if the log operation was successful. */ YAHOO.log = function(msg, cat, src) { --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo/yahoo.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yahoo/yahoo.js @@ -128,7 +128,7 @@ YAHOO.namespace = function() { * @param {String} cat The log category for the message. Default * categories are "info", "warn", "error", time". * Custom categories can be used as well. (opt) - * @param {String} src The source of the the message (opt) + * @param {String} src The source of the message (opt) * @return {Boolean} True if the log operation was successful. */ YAHOO.log = function(msg, cat, src) { --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yuiloader/yuiloader-debug.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yuiloader/yuiloader-debug.js @@ -128,7 +128,7 @@ YAHOO.namespace = function() { * @param {String} cat The log category for the message. Default * categories are "info", "warn", "error", time". * Custom categories can be used as well. (opt) - * @param {String} src The source of the the message (opt) + * @param {String} src The source of the message (opt) * @return {Boolean} True if the log operation was successful. */ YAHOO.log = function(msg, cat, src) { @@ -1618,7 +1618,7 @@ YAHOO.util.Get = function() { TIMEOUT: 2000, /** - * Called by the the helper for detecting script load in Safari + * Called by the helper for detecting script load in Safari * @method _finalize * @param id {string} the transaction id * @private @@ -2462,7 +2462,7 @@ YAHOO.register("get", YAHOO.util.Get, {version: "2.8.0r4", build: "2449"}); this.comboBase = YUI.info.comboBase; /** - * If configured, YUI will use the the combo handler on the + * If configured, YUI will use the combo handler on the * Yahoo! CDN to pontentially reduce the number of http requests * required. * @property combine --- a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yuiloader/yuiloader.js +++ a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yuiloader/yuiloader.js @@ -128,7 +128,7 @@ YAHOO.namespace = function() { * @param {String} cat The log category for the message. Default * categories are "info", "warn", "error", time". * Custom categories can be used as well. (opt) - * @param {String} src The source of the the message (opt) + * @param {String} src The source of the message (opt) * @return {Boolean} True if the log operation was successful. */ YAHOO.log = function(msg, cat, src) { @@ -1618,7 +1618,7 @@ YAHOO.util.Get = function() { TIMEOUT: 2000, /** - * Called by the the helper for detecting script load in Safari + * Called by the helper for detecting script load in Safari * @method _finalize * @param id {string} the transaction id * @private @@ -2462,7 +2462,7 @@ YAHOO.register("get", YAHOO.util.Get, {version: "2.8.0r4", build: "2449"}); this.comboBase = YUI.info.comboBase; /** - * If configured, YUI will use the the combo handler on the + * If configured, YUI will use the combo handler on the * Yahoo! CDN to pontentially reduce the number of http requests * required. * @property combine --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/manage-marc-import.tt @@ -40,7 +40,7 @@ -

See the full documentation for the the Managing Staged MARC Records in the manual (online).

+

See the full documentation for the Managing Staged MARC Records in the manual (online).

[% INCLUDE 'help-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tt @@ -41,7 +41,7 @@

Sincerely, Library Staff

-

See the full documentation for the the Overdue Notice/Status Triggers in the manual (online).

+

See the full documentation for the Overdue Notice/Status Triggers in the manual (online).

[% INCLUDE 'help-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/picture-upload.tt @@ -20,6 +20,6 @@

Important: There is a limit of 520K on the size of the picture uploaded and it is recommended that the image be 200x300 pixels, but smaller images will work as well.

-

See the full documentation for the the Patron Image Uploader in the manual (online).

+

See the full documentation for the Patron Image Uploader in the manual (online).

-[% INCLUDE 'help-bottom.inc' %] +[% INCLUDE 'help-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/scheduler.tt @@ -23,6 +23,6 @@

Task scheduler will not work if the user the web server runs as doesn't have the permission to use it. To find out if the right user has the permissions necessary, check /etc/at.allow to see what users are in it. If you don't have that file, check etc/at.deny. If at.deny exists but is blank, then every user can use it. Talk to your system admin about adding the user to the right place to make the task scheduler work.

-

See the full documentation for the the Task Scheduler in the manual (online).

+

See the full documentation for the Task Scheduler in the manual (online).

-[% INCLUDE 'help-bottom.inc' %] +[% INCLUDE 'help-bottom.inc' %] --