Some fixes around itstool

20 files changed, 142 insertions, 143 deletions

diff --git a/help/C/about.page b/help/C/about.page
index 0aa524f..160488a 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 href="ghelp:gpl" type="help">link</link>, or in the file
+      <link href="help:gpl" type="help">link</link>, or in the file
       COPYING included with the source code of this program. </p>
 </page>
diff --git a/help/C/basicusage.page b/help/C/basicusage.page
index e2f22b1..19922f0 100644
--- a/help/C/basicusage.page
+++ b/help/C/basicusage.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/createnew.page b/help/C/createnew.page
index f98a2fc..7d91229 100644
--- a/help/C/createnew.page
+++ b/help/C/createnew.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/customize.page b/help/C/customize.page
index 1dd3140..f2d7fd9 100644
--- a/help/C/customize.page
+++ b/help/C/customize.page
@@ -13,7 +13,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/customtemplate.page b/help/C/customtemplate.page
index 2de0b9d..27d2d9f 100644
--- a/help/C/customtemplate.page
+++ b/help/C/customtemplate.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/editprop.page b/help/C/editprop.page
index 07b4a40..b66f370 100644
--- a/help/C/editprop.page
+++ b/help/C/editprop.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/index.page b/help/C/index.page
index de674c3..2302f2b 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -13,7 +13,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/labelprop.page b/help/C/labelprop.page
index d77e2bc..fb291f7 100644
--- a/help/C/labelprop.page
+++ b/help/C/labelprop.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/mancreate.page b/help/C/mancreate.page
index 22dfd5e..7f38c5d 100644
--- a/help/C/mancreate.page
+++ b/help/C/mancreate.page
@@ -17,7 +17,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -51,20 +51,20 @@
         <td><p></p></td>
       </tr>
       <tr>
-        <td><p><file>${prefix}/share/libglabels-3.0/templates</file></p></td>
+        <td its:translate="no"><p><file>${prefix}/share/libglabels-3.0/templates</file></p></td>
         <td><p>Predefined templates distributed with <app>gLabels</app>.</p>
             <p><file>${prefix}</file> is usually <file>/usr</file> or <file>/usr/local</file>,
             depending on where <app>gLabels</app> was installed.</p></td>
       </tr>
       <tr>
-        <td><p><file>${XDG_CONFIG_HOME}/libglabels/templates</file></p></td>
+        <td its:translate="no"><p><file>${XDG_CONFIG_HOME}/libglabels/templates</file></p></td>
         <td><p>User defined templates created with the <app>gLabels</app> <gui>Template Designer</gui>.
             <em>Do not put manually created templates in this directory.</em></p>
             <p>If <file>${XDG_CONFIG_HOME}</file> is not defined, it defaults to
             <file>${HOME}/.config</file>.</p></td>
       </tr>
       <tr>
-        <td><p><file>${HOME}/.glabels</file></p></td>
+        <td its:translate="no"><p><file>${HOME}/.glabels</file></p></td>
         <td><p>User defined templates that have been created manually should be placed in this
             directory.
             Older versions of the <app>gLabels</app> <gui>Template Designer</gui> (prior to 3.0)
@@ -95,11 +95,10 @@
            multiple templates for multiple pass printing)</p>
       </item>
       <item>
-        <p>Distances can be expressed in units of <code its:translate="no">pt</code>,
-          <code its:translate="no">in</code>, <code its:translate="no">mm</code>,
-          <code its:translate="no">cm</code>, or <code its:translate="no">pc</code>.  For example:
-          "<code its:translate="no">1.0in</code>" or "<code its:translate="no">2.54cm</code>".  If no
-          units are specified, computer points (<code its:translate="no">pt</code>) will
+        <p>Distances can be expressed in units of <code>pt</code>, <code>in</code>,
+	  <code>mm</code>, <code>cm</code>, or <code>pc</code>.  For example:
+          "<code>1.0in</code>" or "<code>2.54cm</code>".  If no
+          units are specified, computer points (<code>pt</code>) will
           be assumed (1 <em>pt</em> =
           1/72 <em>in</em> = 0.352778 <em>mm</em>).
           </p>
@@ -118,21 +117,21 @@
   <section id="template-file">
     <title>Template Files</title>
 
-    <p>A template file contains a single <code its:translate="no">Glabels-templates</code> top-level
+    <p>A template file contains a single <code>Glabels-templates</code> top-level
     node.</p>
 
-    <code mime="text/xml" its:translate="no">
+    <code mime="text/xml">
 &lt;?xml version="1.0"?&gt;
 &lt;Glabels-templates&gt;
 
-   <var its:translate="yes">...templates...</var>
+   <var>...templates...</var>
 
 &lt;/Glabels-templates&gt;</code>
 
     <listing>
       <title>Example Template</title>
       <desc>Example <app>gLabels</app> template file containing a single
-            <code its:translate="no">Template</code> node.</desc>
+            <code>Template</code> node.</desc>
       <code mime="text/xml" its:translate="no">
 &lt;?xml version="1.0"?&gt;
 &lt;Glabels-templates&gt;
@@ -161,13 +160,13 @@
   <!-- BEGIN Template Node  -->
   <!-- ******************** -->
   <section id="template-template-node">
-    <title><span its:translate="no">Template</span> Node</title>
+    <title><code>Template</code> Node</title>
 
-    <p>A <code its:translate="no">Template</code> node describes a single
+    <p>A <code>Template</code> node describes a single
       stationery product.  It must contain one instance of any type of Label node
-      (<code its:translate="no">Label-rectangle</code>,
-      <code its:translate="no">Label-round</code>, or
-      <code its:translate="no">Label-cd</code>).</p>
+      (<code>Label-rectangle</code>,
+      <code>Label-round</code>, or
+      <code>Label-cd</code>).</p>
 
     <table frame="all" rules="rows">
       <tr>
@@ -177,38 +176,38 @@
         <td><p></p></td>  <td><p></p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">brand</code></p></td>  
+        <td its:translate="no"><p><code>brand</code></p></td>  
         <td><p>Brand or manufacturer of stationery product. E.g. "Avery"</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">part</code></p></td>
+        <td its:translate="no"><p><code>part</code></p></td>
         <td><p>Part number or name of stationery product. E.g. "8160"</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">size</code></p></td>
+        <td its:translate="no"><p><code>size</code></p></td>
         <td><p>Size of sheet.
-               E.g., "<code its:translate="no">US-Letter</code>", "<code its:translate="no">A4</code>", ...
+               E.g., "<code>US-Letter</code>", "<code>A4</code>", ...
             </p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">description</code></p></td>
+        <td its:translate="no"><p><code>description</code></p></td>
         <td><p>Description of stationery product.  E.g, "Mailing Labels."</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">_description</code></p></td>
+        <td its:translate="no"><p><code>_description</code></p></td>
         <td><p>Translatable description of stationery product. E.g, "Mailing Labels."
             (Only useful for predefined templates)</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">width</code></p></td>
+        <td its:translate="no"><p><code>width</code></p></td>
         <td><p>Page width.  Only valid if size="Other"</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">height</code></p></td>
+        <td its:translate="no"><p><code>height</code></p></td>
         <td><p>Page height.  Only valid if size="Other"</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">equiv</code></p></td>
+        <td its:translate="no"><p><code>equiv</code></p></td>
         <td><p>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 @@
   <!-- BEGIN Meta Node      -->
   <!-- ******************** -->
   <section id="meta-template-node">
-    <title><span its:translate="no">Meta</span> Node</title>
+    <title><code>Meta</code> Node</title>
 
-    <p>A <code its:translate="no">Meta</code> node contains some additional
-         information about the template. A <code its:translate="no">Template</code>
-         node may contain zero or more <code its:translate="no">Meta</code> nodes.</p>
+    <p>A <code>Meta</code> node contains some additional
+         information about the template. A <code>Template</code>
+         node may contain zero or more <code>Meta</code> nodes.</p>
 
     <table frame="all" rules="rows">
       <tr>
@@ -241,11 +240,11 @@
         <td><p></p></td>  <td><p></p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">category</code></p></td>
+        <td its:translate="no"><p><code>category</code></p></td>
         <td><p>A category for the template.
             A template can belong to multiple categories by simply adding multiple
-            <code its:translate="no">Meta</code> nodes to the parent
-            <code its:translate="no">Template</code> node.
+            <code>Meta</code> nodes to the parent
+            <code>Template</code> node.
             Template categories are used by the <app>gLabels</app> <gui>New Label
             Dialog</gui> to filter the results of template searches.</p>
 
@@ -253,24 +252,24 @@
             the file <file>${prefix}/libglabels-3.0/templates/categories.xml</file>.
 	      Currently defined category IDs include:</p>
             <list>
-              <item><p><code its:translate="no">label</code></p></item>
-              <item><p><code its:translate="no">round-label</code></p></item>
-              <item><p><code its:translate="no">elliptical-label</code></p></item>
-              <item><p><code its:translate="no">square-label</code></p></item>
-              <item><p><code its:translate="no">rectangle-label</code></p></item>
-              <item><p><code its:translate="no">card</code></p></item>
-              <item><p><code its:translate="no">business-card</code></p></item>
-              <item><p><code its:translate="no">media</code></p></item>
-              <item><p><code its:translate="no">mail</code></p></item>
-              <item><p><code its:translate="no">foldable</code></p></item>
-              <item><p><code its:translate="no">photo</code></p></item>
+              <item its:translate="no"><p><code>label</code></p></item>
+              <item its:translate="no"><p><code>round-label</code></p></item>
+              <item its:translate="no"><p><code>elliptical-label</code></p></item>
+              <item its:translate="no"><p><code>square-label</code></p></item>
+              <item its:translate="no"><p><code>rectangle-label</code></p></item>
+              <item its:translate="no"><p><code>card</code></p></item>
+              <item its:translate="no"><p><code>business-card</code></p></item>
+              <item its:translate="no"><p><code>media</code></p></item>
+              <item its:translate="no"><p><code>mail</code></p></item>
+              <item its:translate="no"><p><code>foldable</code></p></item>
+              <item its:translate="no"><p><code>photo</code></p></item>
             </list>
 
 
         </td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">product_url</code></p></td>
+        <td its:translate="no"><p><code>product_url</code></p></td>
         <td><p>A URL pointing to the vendor's webpage for the specific product, if available.</p></td>
       </tr>
     </table>
@@ -291,9 +290,9 @@
   <!-- BEGIN Label-rectangle Node -->
   <!-- ************************** -->
   <section id="template-label-rectangle-node">
-    <title><span its:translate="no">Label-rectangle</span> Node</title>
+    <title><code>Label-rectangle</code> Node</title>
 
-    <p>A <code its:translate="no">Label-rectangle</code> node describes the
+    <p>A <code>Label-rectangle</code> node describes the
       dimensions of a single label or business card that is rectangular
       in shape (may have rounded edges).</p>
 
@@ -305,30 +304,30 @@
         <td><p></p></td>  <td><p></p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">id</code></p></td>
+        <td its:translate="no"><p><code>id</code></p></td>
         <td><p>Reserved for future use.  Should always be 0.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">width</code></p></td>
+        <td its:translate="no"><p><code>width</code></p></td>
         <td><p>Width of label/card</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">height</code></p></td>
+        <td its:translate="no"><p><code>height</code></p></td>
         <td><p>Heigth of label/card</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">round</code></p></td>
+        <td its:translate="no"><p><code>round</code></p></td>
         <td><p>Radius of corners.  For items with square edges (business cards),
                the radius should be 0.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">x_waste</code></p></td>
+        <td its:translate="no"><p><code>x_waste</code></p></td>
         <td><p>Amount of horizontal waste (over-print) to allow.  This is useful
                       for minimizing alignment problems when using non-white
                       backgrounds (e.g. images).</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">y_waste</code></p></td>
+        <td its:translate="no"><p><code>y_waste</code></p></td>
         <td><p>Amount of vertical waste (over-print) to allow.  This is useful
                       for minimizing alignment problems when using non-white
                       backgrounds (e.g. images).</p></td>
@@ -337,9 +336,9 @@
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><span its:translate="no">Label-rectangle</span> parameters</desc>
-      <media type="image" src="figures/glabels-template-rect-label.png" mime="image/png" style="right">
-        <p><span its:translate="no">Label-rectangle</span> parameters</p>
+      <desc><code>Label-rectangle</code> parameters</desc>
+      <media its:translate="no" type="image" src="figures/glabels-template-rect-label.png" mime="image/png" style="right">
+        <p><code>Label-rectangle</code> parameters</p>
       </media>
     </figure>
     <!-- ==== End of Figure ==== -->
@@ -354,9 +353,9 @@
   <!-- BEGIN Label-ellipse Node -->
   <!-- ************************ -->
   <section id="template-label-ellipse-node">
-    <title><span its:translate="no">Label-ellipse</span> Node</title>
+    <title><code>Label-ellipse</code> Node</title>
 
-    <p>A <code its:translate="no">Label-ellipse</code> node describes the
+    <p>A <code>Label-ellipse</code> node describes the
       dimensions of a single label or business card that is elliptic
       in shape.</p>
 
@@ -368,19 +367,19 @@
         <td><p></p></td>  <td><p></p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">id</code></p></td>
+        <td its:translate="no"><p><code>id</code></p></td>
         <td><p>Reserved for future use.  Should always be 0.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">width</code></p></td>
+        <td its:translate="no"><p><code>width</code></p></td>
         <td><p>Width of the ellipse</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">height</code></p></td>
+        <td its:translate="no"><p><code>height</code></p></td>
         <td><p>Heigth of the ellipse</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">waste</code></p></td>
+        <td its:translate="no"><p><code>waste</code></p></td>
         <td><p>Amount of waste (over-print) to allow.  This is useful
             for minimizing alignment problems when using non-white
             backgrounds (e.g. images).</p></td>
@@ -389,9 +388,9 @@
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><span its:translate="no">Label-ellipse</span> parameters</desc>
+      <desc><span>Label-ellipse</span> parameters</desc>
       <media type="image" src="figures/glabels-template-ellipse-label.png" mime="image/png" style="right">
-        <p><span its:translate="no">Label-ellipse</span> parameters</p>
+        <p><code>Label-ellipse</code> parameters</p>
       </media>
     </figure>
     <!-- ==== End of Figure ==== -->
@@ -406,9 +405,9 @@
   <!-- BEGIN Label-round Node -->
   <!-- ********************** -->
   <section id="template-label-round-node">
-    <title><span its:translate="no">Label-round</span> Node</title>
+    <title><code>Label-round</code> Node</title>
 
-    <p>A <code its:translate="no">Label-round</code> node describes the dimensions
+    <p>A <code>Label-round</code> node describes the dimensions
       of a simple round label (not a CD).</p>
 
     <table frame="all" rules="rows">
@@ -419,15 +418,15 @@
         <td><p></p></td>  <td><p></p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">id</code></p></td>
+        <td its:translate="no"><p><code>id</code></p></td>
         <td><p>Reserved for future use.  Should always be 0.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">radius</code></p></td>
+        <td its:translate="no"><p><code>radius</code></p></td>
         <td><p>Radius (1/2 diameter) of label</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">waste</code></p></td>
+        <td its:translate="no"><p><code>waste</code></p></td>
         <td><p>Amount of waste (over-print) to allow.  This is useful
                 for minimizing alignment problems when using non-white
                 backgrounds (e.g. images).</p></td>
@@ -436,9 +435,9 @@
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><span its:translate="no">Label-ellipse</span> parameters</desc>
-      <media type="image" src="figures/glabels-template-circle-label.png" mime="image/png" style="right">
-        <p><span its:translate="no">Label-ellipse</span> parameters</p>
+      <desc><code>Label-ellipse</code> parameters</desc>
+      <media its:translate="no" type="image" src="figures/glabels-template-circle-label.png" mime="image/png" style="right">
+        <p><code>Label-ellipse</code> parameters</p>
       </media>
     </figure>
     <!-- ==== End of Figure ==== -->
@@ -453,9 +452,9 @@
   <!-- BEGIN Label-cd Node -->
   <!-- ******************* -->
   <section id="template-label-cd-node">
-    <title><span its:translate="no">Label-cd</span> Node</title>
+    <title><code>Label-cd</code> Node</title>
 
-    <p>A <code its:translate="no">Label-cd</code> node describes the dimensions
+    <p>A <code>Label-cd</code> node describes the dimensions
       of a CD, DVD, or business card CD.</p>
 
     <table frame="all" rules="rows">
@@ -466,29 +465,29 @@
         <td><p></p></td>  <td><p></p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">id</code></p></td>
+        <td its:translate="no"><p><code>id</code></p></td>
         <td><p>Reserved for future use.  Should always be 0.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">radius</code></p></td>
+        <td its:translate="no"><p><code>radius</code></p></td>
         <td><p>Outer radius of label</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">hole</code></p></td>
+        <td its:translate="no"><p><code>hole</code></p></td>
         <td><p>Radius of concentric hole</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">width</code></p></td>
+        <td its:translate="no"><p><code>width</code></p></td>
         <td><p>If present, the label is clipped to the given width.
                       (Useful for "business card CDs").</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">height</code></p></td>
+        <td its:translate="no"><p><code>height</code></p></td>
         <td><p>If present, the label is clipped to the given height.
                       (Useful for "business card CDs").</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">waste</code></p></td>
+        <td its:translate="no"><p><code>waste</code></p></td>
         <td><p>Amount of waste (over-print) to allow.  This is useful
                       for minimizing alignment problems when using non-white
                       backgrounds (e.g. images).</p></td>
@@ -497,8 +496,8 @@
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><span its:translate="no">Label-cd</span> parameters</desc>
-      <media type="image" src="figures/glabels-template-cd-label.png" mime="image/png" style="right">
+      <desc><code>Label-cd</code> parameters</desc>
+      <media its:translate="no" type="image" src="figures/glabels-template-cd-label.png" mime="image/png" style="right">
         <p>CD label parameters</p>
       </media>
     </figure>
@@ -514,7 +513,7 @@
   <!-- BEGIN Markup Node -->
   <!-- ***************** -->
   <section id="template-markup">
-    <title><span its:translate="no">Markup</span> Nodes</title>
+    <title><code>Markup</code> Nodes</title>
 
     <p>Templates may contain optional markup nodes.  These nodes are used to describe
     a simple set of markup lines that are visible in the <app>glabels</app> drawing canvas, but
@@ -526,9 +525,9 @@
     <!-- BEGIN Markup-margin Node -->
     <!-- ======================== -->
     <section id="template-markup-margin-node">
-      <title><span its:translate="no">Markup-margin</span> Node</title>
+      <title><code>Markup-margin</code> Node</title>
 
-      <p>A <code its:translate="no">Markup-margin</code> describes a margin along
+      <p>A <code>Markup-margin</code> describes a margin along
       all edges of a label.</p>
 
       <table frame="all" rules="rows">
@@ -539,7 +538,7 @@
           <td><p></p></td>  <td><p></p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">size</code></p></td>
+          <td its:translate="no"><p><code>size</code></p></td>
           <td><p>Size of the margin.  I.e. the distance of the margin
                         line from the edge of the card/label.</p></td>
         </tr>
@@ -554,9 +553,9 @@
     <!-- BEGIN Markup-line Node -->
     <!-- ====================== -->
     <section id="template-markup-line-node">
-      <title><span its:translate="no">Markup-line</span> Node</title>
+      <title><code>Markup-line</code> Node</title>
 
-      <p>A <code its:translate="no">Markup-line</code> node describes a markup line.</p>
+      <p>A <code>Markup-line</code> node describes a markup line.</p>
 
       <table frame="all" rules="rows">
         <tr>
@@ -566,19 +565,19 @@
           <td><p></p></td>  <td><p></p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">x1</code></p></td>
+          <td its:translate="no"><p><code>x1</code></p></td>
           <td><p>x coordinate of 1st endpoint of the line segment.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">y1</code></p></td>
+          <td its:translate="no"><p><code>y1</code></p></td>
           <td><p>y coordinate of 1st endpoint of the line segment.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">x2</code></p></td>
+          <td its:translate="no"><p><code>x2</code></p></td>
           <td><p>x coordinate of 2st endpoint of the line segment.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">y2</code></p></td>
+          <td its:translate="no"><p><code>y2</code></p></td>
           <td><p>y coordinate of 2st endpoint of the line segment.</p></td>
         </tr>
       </table>
@@ -592,9 +591,9 @@
     <!-- BEGIN Markup-circle Node -->
     <!-- ======================== -->
     <section id="template-markup-circle-node">
-      <title><span its:translate="no">Markup-circle</span> Node</title>
+      <title><code>Markup-circle</code> Node</title>
 
-      <p>A <code its:translate="no">Markup-circle</code> describes a markup circle.</p>
+      <p>A <code>Markup-circle</code> describes a markup circle.</p>
 
       <table frame="all" rules="rows">
         <tr>
@@ -604,15 +603,15 @@
           <td><p></p></td>  <td><p></p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">x0</code></p></td>
+          <td its:translate="no"><p><code>x0</code></p></td>
           <td><p>x coordinate of circle origin (center).</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">y0</code></p></td>
+          <td its:translate="no"><p><code>y0</code></p></td>
           <td><p>y coordinate of circle origin (center).</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">radius</code></p></td>
+          <td its:translate="no"><p><code>radius</code></p></td>
           <td><p>Radius of circle.</p></td>
         </tr>
       </table>
@@ -626,9 +625,9 @@
     <!-- BEGIN Markup-rect Node -->
     <!-- ====================== -->
     <section id="template-markup-rect-node">
-      <title><span its:translate="no">Markup-rect</span> Node</title>
+      <title><code>Markup-rect</code> Node</title>
 
-      <p>A <code its:translate="no">Markup-rect</code> describes a markup rectangle.</p>
+      <p>A <code>Markup-rect</code> describes a markup rectangle.</p>
 
       <table frame="all" rules="rows">
         <tr>
@@ -638,23 +637,23 @@
           <td><p></p></td>  <td><p></p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">x1</code></p></td>
+          <td its:translate="no"><p><code>x1</code></p></td>
           <td><p>x coordinate of upper left corner of rectangle.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">y1</code></p></td>
+          <td its:translate="no"><p><code>y1</code></p></td>
           <td><p>y coordinate of upper left corner of rectangle.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">w</code></p></td>
+          <td its:translate="no"><p><code>w</code></p></td>
           <td><p>Width of rectangle.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">h</code></p></td>
+          <td its:translate="no"><p><code>h</code></p></td>
           <td><p>Height of rectangle.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">r</code></p></td>
+          <td its:translate="no"><p><code>r</code></p></td>
           <td><p>Radius of rounded corners of rectangle.</p></td>
         </tr>
       </table>
@@ -668,9 +667,9 @@
     <!-- BEGIN Markup-ellipse Node -->
     <!-- ========================= -->
     <section id="template-markup-ellipse-node">
-      <title><span its:translate="no">Markup-ellipse</span> Node</title>
+      <title><code>Markup-ellipse</code> Node</title>
 
-      <p>A <code its:translate="no">Markup-ellipse</code> describes a markup ellipse.</p>
+      <p>A <code>Markup-ellipse</code> describes a markup ellipse.</p>
 
       <table frame="all" rules="rows">
         <tr>
@@ -680,19 +679,19 @@
           <td><p></p></td>  <td><p></p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">x1</code></p></td>
+          <td its:translate="no"><p><code>x1</code></p></td>
           <td><p>x coordinate of upper left corner of ellipse.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">y1</code></p></td>
+          <td its:translate="no"><p><code>y1</code></p></td>
           <td><p>y coordinate of upper left corner of ellipse.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">w</code></p></td>
+          <td its:translate="no"><p><code>w</code></p></td>
           <td><p>Width of ellipse.</p></td>
         </tr>
         <tr>
-          <td><p><code its:translate="no">h</code></p></td>
+          <td its:translate="no"><p><code>h</code></p></td>
           <td><p>Height of ellipse.</p></td>
         </tr>
       </table>
@@ -711,20 +710,20 @@
   <!-- BEGIN Layout Node -->
   <!-- ***************** -->
   <section id="template-layout-node">
-    <title><span its:translate="no">Layout</span> Node</title>
+    <title><code>Layout</code> Node</title>
 
-    <p>A label node may contain multiple <code its:translate="no">Layout</code>
+    <p>A label node may contain multiple <code>Layout</code>
       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
-      <code its:translate="no">Layout</code> tags can be used. </p>
+      <code>Layout</code> tags can be used.</p>
     <p>A common example for multiple layouts is a sheet with three
        CD labels:</p>
 
     <!-- ==== Figure ==== -->
     <figure>
       <desc>CD label sheet</desc>
-      <media type="image" src="figures/layouts-cdlabel.png" mime="image/png" style="right">
+      <media its:translate="no" type="image" src="figures/layouts-cdlabel.png" mime="image/png" style="right">
         <p>CD label sheet</p>
       </media>
     </figure>
@@ -757,38 +756,38 @@
         <td><p></p></td>  <td><p></p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">nx</code></p></td>
+        <td its:translate="no"><p><code>nx</code></p></td>
         <td><p>Number of labels/cards across in the grid (horizontal)</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">ny</code></p></td>
+        <td its:translate="no"><p><code>ny</code></p></td>
         <td><p>Number of labels/cards across in the grid (vertical)</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">x0</code></p></td>
+        <td its:translate="no"><p><code>x0</code></p></td>
         <td><p>Distance from left edge of sheet to the left edge of
             the left column of cards/labels in the layout.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">y0</code></p></td>
+        <td its:translate="no"><p><code>y0</code></p></td>
         <td><p>Distance from the top edge of sheet to the top edge of
              the top row of labels/cards in the layout.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">dx</code></p></td>
+        <td its:translate="no"><p><code>dx</code></p></td>
         <td><p>Horizontal pitch of grid.</p></td>
       </tr>
       <tr>
-        <td><p><code its:translate="no">dy</code></p></td>
+        <td its:translate="no"><p><code>dy</code></p></td>
         <td><p>Vertical pitch of grid.</p></td>
       </tr>
     </table>
 
     <!-- ==== Figure ==== -->
     <figure>
-      <desc><span its:translate="no">Layout</span> parameters</desc>
-      <media type="image" src="figures/glabels-template-layout.png" mime="image/png" style="right">
-        <p><span its:translate="no">Layout</span> Parameters</p>
+      <desc><code>Layout</code> parameters</desc>
+      <media its:translate="no" type="image" src="figures/glabels-template-layout.png" mime="image/png" style="right">
+        <p><span>Layout</span> Parameters</p>
       </media>
     </figure>
     <!-- ==== End of Figure ==== -->
diff --git a/help/C/merge-ex1.page b/help/C/merge-ex1.page
index 29ea44c..cbbcc5e 100644
--- a/help/C/merge-ex1.page
+++ b/help/C/merge-ex1.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/merge-ex2.page b/help/C/merge-ex2.page
index 4dfef4f..e1d1fea 100644
--- a/help/C/merge-ex2.page
+++ b/help/C/merge-ex2.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/merge-ex3.page b/help/C/merge-ex3.page
index 6505936..f04e70a 100644
--- a/help/C/merge-ex3.page
+++ b/help/C/merge-ex3.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/merge-ex4.page b/help/C/merge-ex4.page
index 5295113..2dd041d 100644
--- a/help/C/merge-ex4.page
+++ b/help/C/merge-ex4.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/merge.page b/help/C/merge.page
index 033ebd0..635b06b 100644
--- a/help/C/merge.page
+++ b/help/C/merge.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/mergefeatures.page b/help/C/mergefeatures.page
index e325527..35351ac 100644
--- a/help/C/mergefeatures.page
+++ b/help/C/mergefeatures.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/multifile.page b/help/C/multifile.page
index acfa057..cb79572 100644
--- a/help/C/multifile.page
+++ b/help/C/multifile.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/newlabel.page b/help/C/newlabel.page
index 4b2809e..617cc72 100644
--- a/help/C/newlabel.page
+++ b/help/C/newlabel.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/printfile.page b/help/C/printfile.page
index f55a6c0..8c07cae 100644
--- a/help/C/printfile.page
+++ b/help/C/printfile.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/select.page b/help/C/select.page
index dc3fea7..f0227e7 100644
--- a/help/C/select.page
+++ b/help/C/select.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
diff --git a/help/C/skipfields.page b/help/C/skipfields.page
index d7030ab..864feec 100755
--- a/help/C/skipfields.page
+++ b/help/C/skipfields.page
@@ -15,7 +15,7 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>