From: Mario Blättermann Date: Mon, 24 Sep 2012 11:06:25 +0000 (+0200) Subject: Some fixes around itstool X-Git-Tag: glabels-3_2_0~48 X-Git-Url: https://git.sur5r.net/?p=glabels;a=commitdiff_plain;h=933a3996cf531177ba200d8ce21b753033f33530 Some fixes around itstool --- diff --git a/help/C/about.page b/help/C/about.page index 0aa524fc..160488a7 100644 --- a/help/C/about.page +++ b/help/C/about.page @@ -38,6 +38,6 @@ General Public license as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. A copy of this license can be found at this - link, or in the file + link, or in the file COPYING included with the source code of this program.

diff --git a/help/C/basicusage.page b/help/C/basicusage.page index e2f22b1d..19922f04 100644 --- a/help/C/basicusage.page +++ b/help/C/basicusage.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/createnew.page b/help/C/createnew.page index f98a2fc5..7d91229a 100644 --- a/help/C/createnew.page +++ b/help/C/createnew.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/customize.page b/help/C/customize.page index 1dd3140d..f2d7fd91 100644 --- a/help/C/customize.page +++ b/help/C/customize.page @@ -13,7 +13,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/customtemplate.page b/help/C/customtemplate.page index 2de0b9da..27d2d9f4 100644 --- a/help/C/customtemplate.page +++ b/help/C/customtemplate.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/editprop.page b/help/C/editprop.page index 07b4a40a..b66f3703 100644 --- a/help/C/editprop.page +++ b/help/C/editprop.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/index.page b/help/C/index.page index de674c3c..2302f2bf 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -13,7 +13,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/labelprop.page b/help/C/labelprop.page index d77e2bcd..fb291f73 100644 --- a/help/C/labelprop.page +++ b/help/C/labelprop.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/mancreate.page b/help/C/mancreate.page index 22dfd5e4..7f38c5d9 100644 --- a/help/C/mancreate.page +++ b/help/C/mancreate.page @@ -17,7 +17,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

@@ -51,20 +51,20 @@

-

${prefix}/share/libglabels-3.0/templates

+

${prefix}/share/libglabels-3.0/templates

Predefined templates distributed with gLabels.

${prefix} is usually /usr or /usr/local, depending on where gLabels was installed.

-

${XDG_CONFIG_HOME}/libglabels/templates

+

${XDG_CONFIG_HOME}/libglabels/templates

User defined templates created with the gLabels Template Designer. Do not put manually created templates in this directory.

If ${XDG_CONFIG_HOME} is not defined, it defaults to ${HOME}/.config.

-

${HOME}/.glabels

+

${HOME}/.glabels

User defined templates that have been created manually should be placed in this directory. Older versions of the gLabels Template Designer (prior to 3.0) @@ -95,11 +95,10 @@ multiple templates for multiple pass printing)

-

Distances can be expressed in units of pt, - in, mm, - cm, or pc. For example: - "1.0in" or "2.54cm". If no - units are specified, computer points (pt) will +

Distances can be expressed in units of pt, in, + mm, cm, or pc. For example: + "1.0in" or "2.54cm". If no + units are specified, computer points (pt) will be assumed (1 pt = 1/72 in = 0.352778 mm).

@@ -118,21 +117,21 @@
Template Files -

A template file contains a single Glabels-templates top-level +

A template file contains a single Glabels-templates top-level node.

- + <?xml version="1.0"?> <Glabels-templates> - ...templates... + ...templates... </Glabels-templates> Example Template Example gLabels template file containing a single - Template node. + Template node. <?xml version="1.0"?> <Glabels-templates> @@ -161,13 +160,13 @@
- <span its:translate="no">Template</span> Node + <code>Template</code> Node -

A Template node describes a single +

A Template node describes a single stationery product. It must contain one instance of any type of Label node - (Label-rectangle, - Label-round, or - Label-cd).

+ (Label-rectangle, + Label-round, or + Label-cd).

@@ -177,38 +176,38 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -337,9 +336,9 @@
- Label-rectangle parameters - -

Label-rectangle parameters

+ Label-rectangle parameters + +

Label-rectangle parameters
@@ -354,9 +353,9 @@
- <span its:translate="no">Label-ellipse</span> Node + <code>Label-ellipse</code> Node -

A Label-ellipse node describes the +

A Label-ellipse node describes the dimensions of a single label or business card that is elliptic in shape.

@@ -368,19 +367,19 @@
- + - + - + - + @@ -389,9 +388,9 @@
- Label-ellipse parameters + Label-ellipse parameters -

Label-ellipse parameters

+

Label-ellipse parameters
@@ -406,9 +405,9 @@
- <span its:translate="no">Label-round</span> Node + <code>Label-round</code> Node -

A Label-round node describes the dimensions +

A Label-round node describes the dimensions of a simple round label (not a CD).

brand

brand

Brand or manufacturer of stationery product. E.g. "Avery"

part

part

Part number or name of stationery product. E.g. "8160"

size

size

Size of sheet. - E.g., "US-Letter", "A4", ... + E.g., "US-Letter", "A4", ...

description

description

Description of stationery product. E.g, "Mailing Labels."

_description

_description

Translatable description of stationery product. E.g, "Mailing Labels." (Only useful for predefined templates)

width

width

Page width. Only valid if size="Other"

height

height

Page height. Only valid if size="Other"

equiv

equiv

Equivalent part number. If this property is present, the template is a clone of another template of the same brand. The template will inherit all properties, except brand and name from the other template. @@ -227,11 +226,11 @@

- <span its:translate="no">Meta</span> Node + <code>Meta</code> Node -

A Meta node contains some additional - information about the template. A Template - node may contain zero or more Meta nodes.

+

A Meta node contains some additional + information about the template. A Template + node may contain zero or more Meta nodes.

@@ -241,11 +240,11 @@ - + - +

category

category

A category for the template. A template can belong to multiple categories by simply adding multiple - Meta nodes to the parent - Template node. + Meta nodes to the parent + Template node. Template categories are used by the gLabels New Label Dialog to filter the results of template searches.

@@ -253,24 +252,24 @@ the file ${prefix}/libglabels-3.0/templates/categories.xml. Currently defined category IDs include:

-

label

 -

round-label

 -

elliptical-label

 -

square-label

 -

rectangle-label

 -

card

 -

business-card

 -

media

 -

mail

 -

foldable

 -

photo

 +

label

 +

round-label

 +

elliptical-label

 +

square-label

 +

rectangle-label

 +

card

 +

business-card

 +

media

 +

mail

 +

foldable

 +

photo

product_url

product_url

A URL pointing to the vendor's webpage for the specific product, if available.
@@ -291,9 +290,9 @@
- <span its:translate="no">Label-rectangle</span> Node + <code>Label-rectangle</code> Node -

A Label-rectangle node describes the +

A Label-rectangle node describes the dimensions of a single label or business card that is rectangular in shape (may have rounded edges).

@@ -305,30 +304,30 @@

id

id

Reserved for future use. Should always be 0.

width

width

Width of label/card

height

height

Heigth of label/card

round

round

Radius of corners. For items with square edges (business cards), the radius should be 0.

x_waste

x_waste

Amount of horizontal waste (over-print) to allow. This is useful for minimizing alignment problems when using non-white backgrounds (e.g. images).

y_waste

y_waste

Amount of vertical waste (over-print) to allow. This is useful for minimizing alignment problems when using non-white backgrounds (e.g. images).

id

id

Reserved for future use. Should always be 0.

width

width

Width of the ellipse

height

height

Heigth of the ellipse

waste

waste

Amount of waste (over-print) to allow. This is useful for minimizing alignment problems when using non-white backgrounds (e.g. images).
@@ -419,15 +418,15 @@ - + - + - + @@ -436,9 +435,9 @@
- Label-ellipse parameters - -

Label-ellipse parameters

+ Label-ellipse parameters + +

Label-ellipse parameters
@@ -453,9 +452,9 @@
- <span its:translate="no">Label-cd</span> Node + <code>Label-cd</code> Node -

A Label-cd node describes the dimensions +

A Label-cd node describes the dimensions of a CD, DVD, or business card CD.

id

id

Reserved for future use. Should always be 0.

radius

radius

Radius (1/2 diameter) of label

waste

waste

Amount of waste (over-print) to allow. This is useful for minimizing alignment problems when using non-white backgrounds (e.g. images).
@@ -466,29 +465,29 @@ - + - + - + - + - + - + @@ -497,8 +496,8 @@
- Label-cd parameters - + Label-cd parameters +

CD label parameters
@@ -514,7 +513,7 @@
- <span its:translate="no">Markup</span> Nodes + <code>Markup</code> Nodes

Templates may contain optional markup nodes. These nodes are used to describe a simple set of markup lines that are visible in the glabels drawing canvas, but @@ -526,9 +525,9 @@

- <span its:translate="no">Markup-margin</span> Node + <code>Markup-margin</code> Node -

A Markup-margin describes a margin along +

A Markup-margin describes a margin along all edges of a label.

id

id

Reserved for future use. Should always be 0.

radius

radius

Outer radius of label

hole

hole

Radius of concentric hole

width

width

If present, the label is clipped to the given width. (Useful for "business card CDs").

height

height

If present, the label is clipped to the given height. (Useful for "business card CDs").

waste

waste

Amount of waste (over-print) to allow. This is useful for minimizing alignment problems when using non-white backgrounds (e.g. images).
@@ -539,7 +538,7 @@ - + @@ -554,9 +553,9 @@
- <span its:translate="no">Markup-line</span> Node + <code>Markup-line</code> Node -

A Markup-line node describes a markup line.

+

A Markup-line node describes a markup line.

size

size

Size of the margin. I.e. the distance of the margin line from the edge of the card/label.
@@ -566,19 +565,19 @@ - + - + - + - +

x1

x1

x coordinate of 1st endpoint of the line segment.

y1

y1

y coordinate of 1st endpoint of the line segment.

x2

x2

x coordinate of 2st endpoint of the line segment.

y2

y2

y coordinate of 2st endpoint of the line segment.
@@ -592,9 +591,9 @@
- <span its:translate="no">Markup-circle</span> Node + <code>Markup-circle</code> Node -

A Markup-circle describes a markup circle.

+

A Markup-circle describes a markup circle.

@@ -604,15 +603,15 @@ - + - + - +

x0

x0

x coordinate of circle origin (center).

y0

y0

y coordinate of circle origin (center).

radius

radius

Radius of circle.
@@ -626,9 +625,9 @@
- <span its:translate="no">Markup-rect</span> Node + <code>Markup-rect</code> Node -

A Markup-rect describes a markup rectangle.

+

A Markup-rect describes a markup rectangle.

@@ -638,23 +637,23 @@ - + - + - + - + - +

x1

x1

x coordinate of upper left corner of rectangle.

y1

y1

y coordinate of upper left corner of rectangle.

w

w

Width of rectangle.

h

h

Height of rectangle.

r

r

Radius of rounded corners of rectangle.
@@ -668,9 +667,9 @@
- <span its:translate="no">Markup-ellipse</span> Node + <code>Markup-ellipse</code> Node -

A Markup-ellipse describes a markup ellipse.

+

A Markup-ellipse describes a markup ellipse.

@@ -680,19 +679,19 @@ - + - + - + - +

x1

x1

x coordinate of upper left corner of ellipse.

y1

y1

y coordinate of upper left corner of ellipse.

w

w

Width of ellipse.

h

h

Height of ellipse.
@@ -711,20 +710,20 @@
- <span its:translate="no">Layout</span> Node + <code>Layout</code> Node -

A label node may contain multiple Layout +

A label node may contain multiple Layout children. If labels are arranged in a simple grid pattern, only one layout is needed. However, if labels are arranged in multiple grids, such as a running bond pattern, multiple - Layout tags can be used.

+ Layout tags can be used.

A common example for multiple layouts is a sheet with three CD labels:

CD label sheet - +

CD label sheet
@@ -757,38 +756,38 @@

-

nx

+

nx

Number of labels/cards across in the grid (horizontal)

-

ny

+

ny

Number of labels/cards across in the grid (vertical)

-

x0

+

x0

Distance from left edge of sheet to the left edge of the left column of cards/labels in the layout.

-

y0

+

y0

Distance from the top edge of sheet to the top edge of the top row of labels/cards in the layout.

-

dx

+

dx

Horizontal pitch of grid.

-

dy

+

dy

Vertical pitch of grid.

- Layout parameters - -

Layout Parameters

+ Layout parameters + +

Layout Parameters
diff --git a/help/C/merge-ex1.page b/help/C/merge-ex1.page index 29ea44c7..cbbcc5e8 100644 --- a/help/C/merge-ex1.page +++ b/help/C/merge-ex1.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/merge-ex2.page b/help/C/merge-ex2.page index 4dfef4fa..e1d1feab 100644 --- a/help/C/merge-ex2.page +++ b/help/C/merge-ex2.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/merge-ex3.page b/help/C/merge-ex3.page index 6505936b..f04e70a5 100644 --- a/help/C/merge-ex3.page +++ b/help/C/merge-ex3.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/merge-ex4.page b/help/C/merge-ex4.page index 52951131..2dd041d9 100644 --- a/help/C/merge-ex4.page +++ b/help/C/merge-ex4.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/merge.page b/help/C/merge.page index 033ebd0e..635b06bd 100644 --- a/help/C/merge.page +++ b/help/C/merge.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/mergefeatures.page b/help/C/mergefeatures.page index e3255275..35351ac5 100644 --- a/help/C/mergefeatures.page +++ b/help/C/mergefeatures.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/multifile.page b/help/C/multifile.page index acfa057b..cb79572c 100644 --- a/help/C/multifile.page +++ b/help/C/multifile.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/newlabel.page b/help/C/newlabel.page index 4b2809eb..617cc725 100644 --- a/help/C/newlabel.page +++ b/help/C/newlabel.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/printfile.page b/help/C/printfile.page index f55a6c02..8c07cae1 100644 --- a/help/C/printfile.page +++ b/help/C/printfile.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/select.page b/help/C/select.page index dc3fea77..f0227e70 100644 --- a/help/C/select.page +++ b/help/C/select.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0

diff --git a/help/C/skipfields.page b/help/C/skipfields.page index d7030ab8..864feece 100755 --- a/help/C/skipfields.page +++ b/help/C/skipfields.page @@ -15,7 +15,7 @@ Mario Blättermann - mariobl@gnome.org + mario.blaettermann@gmail.com

Creative Commons Share Alike 3.0