From 71819034a8140dcad8731d9095f018d683b27340 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Wed, 24 Nov 2010 14:50:42 -0500 Subject: [PATCH] Cleanup of template database. - Moved "Herma" templates to their own file. - Replaced some deprecated "Alias" tags. --- po/POTFILES.in | 1 + templates/Makefile.am | 1 + templates/avery-iso-templates.xml | 5 - templates/herma-iso-templates.xml | 207 ++++++++++++++++++++++++++ templates/misc-iso-templates.xml | 164 -------------------- templates/zweckform-iso-templates.xml | 46 ++++++ 6 files changed, 255 insertions(+), 169 deletions(-) create mode 100644 templates/herma-iso-templates.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index b8524c7c..36e9c494 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -228,6 +228,7 @@ libglabels/xml-template.h [type: gettext/xml]templates/avery-other-templates.xml [type: gettext/xml]templates/brother-other-templates.xml [type: gettext/xml]templates/dymo-other-templates.xml +[type: gettext/xml]templates/herma-iso-templates.xml [type: gettext/xml]templates/jac-iso-templates.xml [type: gettext/xml]templates/maco-us-templates.xml [type: gettext/xml]templates/misc-us-templates.xml diff --git a/templates/Makefile.am b/templates/Makefile.am index 7570bdd5..2383faa6 100644 --- a/templates/Makefile.am +++ b/templates/Makefile.am @@ -16,6 +16,7 @@ templates_DATA = \ avery-other-templates.xml \ brother-other-templates.xml \ dymo-other-templates.xml \ + herma-iso-templates.xml \ jac-iso-templates.xml \ maco-us-templates.xml \ misc-us-templates.xml \ diff --git a/templates/avery-iso-templates.xml b/templates/avery-iso-templates.xml index 841d2cca..3ab66e05 100644 --- a/templates/avery-iso-templates.xml +++ b/templates/avery-iso-templates.xml @@ -249,8 +249,6 @@ - -