r19166 by jghali - #12182: Backport template.xml files to 1.4.5svn

scribus-commit scribus-commit at lists.scribus.net
Sun Jun 1 21:35:57 UTC 2014


Author: jghali
Date: Sun Jun  1 21:35:57 2014
New Revision: 19166

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19166
Log:
#12182: Backport template.xml files to 1.4.5svn

Added:
    branches/Version14x/Scribus/resources/templates/template.es.xml
    branches/Version14x/Scribus/resources/templates/template.it.xml
Modified:
    branches/Version14x/Scribus/resources/templates/CMakeLists.txt
    branches/Version14x/Scribus/resources/templates/template.de.xml
    branches/Version14x/Scribus/resources/templates/template.hu.xml
    branches/Version14x/Scribus/resources/templates/template.xml
    branches/Version14x/Scribus/scribus/nftrcreader.cpp

Modified: branches/Version14x/Scribus/resources/templates/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19166&path=/branches/Version14x/Scribus/resources/templates/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/resources/templates/CMakeLists.txt (original)
+++ branches/Version14x/Scribus/resources/templates/CMakeLists.txt Sun Jun  1 21:35:57 2014
@@ -18,7 +18,17 @@
 	)
 
 	INSTALL(FILES
+	template.es.xml
+	  DESTINATION ${TEMPLATEDIR}
+	)
+
+	INSTALL(FILES
 	template.hu.xml
+	  DESTINATION ${TEMPLATEDIR}
+	)
+
+	INSTALL(FILES
+	template.it.xml
 	  DESTINATION ${TEMPLATEDIR}
 	)
 

Modified: branches/Version14x/Scribus/resources/templates/template.de.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19166&path=/branches/Version14x/Scribus/resources/templates/template.de.xml
==============================================================================
--- branches/Version14x/Scribus/resources/templates/template.de.xml (original)
+++ branches/Version14x/Scribus/resources/templates/template.de.xml Sun Jun  1 21:35:57 2014
@@ -210,7 +210,7 @@
 		<author>vectorportal.com</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_A4_L</name>
 		<file>grid_br_a4_l/Brochure_Grid_A4_L.sla.gz</file>
 		<tnail>grid_br_a4_l/Brochure_Grid_A4_Ltn.png</tnail>
@@ -224,7 +224,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_A4_P</name>
 		<file>grid_br_a4_p/Brochure_Grid_A4_P.sla.gz</file>
 		<tnail>grid_br_a4_p/Brochure_Grid_A4_Ptn.png</tnail>
@@ -238,7 +238,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_975x85_in_L</name>
 		<file>grid_br_975x85in_l/Brochure_Grid_975x85in_L.sla.gz</file>
 		<tnail>grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png</tnail>
@@ -252,7 +252,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_975x85_in_P</name>
 		<file>grid_br_975x85_p/Brochure_Grid_975x85in_P.sla.gz</file>
 		<tnail>grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png</tnail>
@@ -266,7 +266,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_375x85_in_P</name>
 		<file>grid_br_375x85_p/Brochure_Grid_375x85in_P.sla.gz</file>
 		<tnail>grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png</tnail>
@@ -280,7 +280,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_375x85_in_L</name>
 		<file>grid_br_375x85_l/Brochure_Grid_375x85in_L.sla.gz</file>
 		<tnail>grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png</tnail>
@@ -294,7 +294,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_100x210_P</name>
 		<file>grid_br_100x210_p/Brochure_Grid_100x210_P.sla.gz</file>
 		<tnail>grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png</tnail>
@@ -308,7 +308,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_100x210_L</name>
 		<file>grid_br_100x210_l/Brochure_Grid_100x210_L.sla.gz</file>
 		<tnail>grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png</tnail>
@@ -322,7 +322,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_55x85in_P</name>
 		<file>grid_br_55x86in_p/Brochure_Grid_55x85in_P.sla.gz</file>
 		<tnail>grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png</tnail>
@@ -336,7 +336,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_55x85in_L</name>
 		<file>grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz</file>
 		<tnail>grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png</tnail>
@@ -350,7 +350,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Poster">
+	<template category="Grids">
 		<name>Poster_Grid_A3</name>
 		<file>grid_poster_a3/Poster_Grid_A3.sla.gz</file>
 		<tnail>grid_poster_a3/Poster_Grid_A3tn.png</tnail>
@@ -364,7 +364,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Poster">
+	<template category="Grids">
 		<name>Poster_Grid_A2</name>
 		<file>grid_poster_a2/Poster_Grid_A2.sla.gz</file>
 		<tnail>grid_poster_a2/Poster_Grid_A2tn.png</tnail>
@@ -392,7 +392,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Poster">
+	<template category="Grids">
 		<name>Poster_Grid_A0</name>
 		<file>grid_poster_a0/Poster_Grid_A0.sla.gz</file>
 		<tnail>grid_poster_a0/Poster_Grid_A0tn.png</tnail>
@@ -406,7 +406,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_USL_P</name>
 		<file>grid_br_usl_p/Brochure_Grid_USL_P.sla.gz</file>
 		<tnail>grid_br_usl_p/Brochure_Grid_USL_Ptn.png</tnail>
@@ -420,7 +420,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_USL_L</name>
 		<file>grid_br_usl_l/Brochure_Grid_USL_L.sla.gz</file>
 		<tnail>grid_br_usl_l/Brochure_Grid_USL_Ltn.png</tnail>
@@ -434,7 +434,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_DIN_LANG_P</name>
 		<file>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.sla.gz</file>
 		<tnail>grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png</tnail>
@@ -448,7 +448,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_DIN_LANG_L</name>
 		<file>grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.sla.gz</file>
 		<tnail>grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png</tnail>
@@ -462,7 +462,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_A5_P</name>
 		<file>grid_br_a5_p/Brochure_Grid_A5_P.sla.gz</file>
 		<tnail>grid_br_a5_p/Brochure_Grid_A5_Portraittn.png</tnail>
@@ -476,7 +476,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Broschüren">
+	<template category="Grids">
 		<name>Brochure_Grid_A5_L</name>
 		<file>grid_br_a5_l/Brochure_Grid_A5_L.sla.gz</file>
 		<tnail>grid_br_a5_l/Brochure_Grid_A5_Ltn.png</tnail>

Modified: branches/Version14x/Scribus/resources/templates/template.hu.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19166&path=/branches/Version14x/Scribus/resources/templates/template.hu.xml
==============================================================================
--- branches/Version14x/Scribus/resources/templates/template.hu.xml (original)
+++ branches/Version14x/Scribus/resources/templates/template.hu.xml Sun Jun  1 21:35:57 2014
@@ -210,7 +210,7 @@
 		<author>vectorportal.com</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács A4 fekvő</name>
 		<file>grid_br_a4_l/Brochure_Grid_A4_L.sla.gz</file>
 		<tnail>grid_br_a4_l/Brochure_Grid_A4_Ltn.png</tnail>
@@ -224,7 +224,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács A4 álló</name>
 		<file>grid_br_a4_p/Brochure_Grid_A4_P.sla.gz</file>
 		<tnail>grid_br_a4_p/Brochure_Grid_A4_Ptn.png</tnail>
@@ -238,7 +238,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 975×85 in fekvő</name>
 		<file>grid_br_975x85in_l/Brochure_Grid_975x85in_L.sla.gz</file>
 		<tnail>grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png</tnail>
@@ -252,7 +252,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 975×85 in álló</name>
 		<file>grid_br_975x85_p/Brochure_Grid_975x85in_P.sla.gz</file>
 		<tnail>grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png</tnail>
@@ -266,7 +266,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 375×85 in álló</name>
 		<file>grid_br_375x85_p/Brochure_Grid_375x85in_P.sla.gz</file>
 		<tnail>grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png</tnail>
@@ -280,7 +280,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 375×85 in fekvő</name>
 		<file>grid_br_375x85_l/Brochure_Grid_375x85in_L.sla.gz</file>
 		<tnail>grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png</tnail>
@@ -294,7 +294,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 100×210 álló</name>
 		<file>grid_br_100x210_p/Brochure_Grid_100x210_P.sla.gz</file>
 		<tnail>grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png</tnail>
@@ -308,7 +308,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 100×210 fekvő</name>
 		<file>grid_br_100x210_l/Brochure_Grid_100x210_L.sla.gz</file>
 		<tnail>grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png</tnail>
@@ -322,7 +322,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 55×85 in álló</name>
 		<file>grid_br_55x86in_p/Brochure_Grid_55x85in_P.sla.gz</file>
 		<tnail>grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png</tnail>
@@ -336,7 +336,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács 55×85 in fekvő</name>
 		<file>grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz</file>
 		<tnail>grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png</tnail>
@@ -350,7 +350,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Plakátok">
+	<template category="Rácsok">
 		<name>Plakát rács A3</name>
 		<file>grid_poster_a3/Poster_Grid_A3.sla.gz</file>
 		<tnail>grid_poster_a3/Poster_Grid_A3tn.png</tnail>
@@ -364,7 +364,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Plakátok">
+	<template category="Rácsok">
 		<name>Plakát rács A2</name>
 		<file>grid_poster_a2/Poster_Grid_A2.sla.gz</file>
 		<tnail>grid_poster_a2/Poster_Grid_A2tn.png</tnail>
@@ -378,7 +378,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Plakátok">
+	<template category="Rácsok">
 		<name>Plakát rács A1</name>
 		<file>grid_poster_a1/Poster_Grid_A1.sla.gz</file>
 		<tnail>grid_poster_a1/Poster_Grid_A1tn.png</tnail>
@@ -392,7 +392,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Plakátok">
+	<template category="Rácsok">
 		<name>Plakát rács A0</name>
 		<file>grid_poster_a0/Poster_Grid_A0.sla.gz</file>
 		<tnail>grid_poster_a0/Poster_Grid_A0tn.png</tnail>
@@ -406,7 +406,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács USL álló</name>
 		<file>grid_br_usl_p/Brochure_Grid_USL_P.sla.gz</file>
 		<tnail>grid_br_usl_p/Brochure_Grid_USL_Ptn.png</tnail>
@@ -420,7 +420,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács USL fekvő</name>
 		<file>grid_br_usl_l/Brochure_Grid_USL_L.sla.gz</file>
 		<tnail>grid_br_usl_l/Brochure_Grid_USL_Ltn.png</tnail>
@@ -434,7 +434,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács DIN LANG álló</name>
 		<file>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.sla.gz</file>
 		<tnail>grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png</tnail>
@@ -448,7 +448,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács DIN LANG fekvő</name>
 		<file>grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.sla.gz</file>
 		<tnail>grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png</tnail>
@@ -462,7 +462,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács A5 álló</name>
 		<file>grid_br_a5_p/Brochure_Grid_A5_P.sla.gz</file>
 		<tnail>grid_br_a5_p/Brochure_Grid_A5_Portraittn.png</tnail>
@@ -476,7 +476,7 @@
 		<author>Christoph Schäfer</author>
 		<email></email>
 	</template>
-	<template category="Brosúrák">
+	<template category="Rácsok">
 		<name>Brosúra rács A5 fekvő</name>
 		<file>grid_br_a5_l/Brochure_Grid_A5_L.sla.gz</file>
 		<tnail>grid_br_a5_l/Brochure_Grid_A5_Ltn.png</tnail>

Modified: branches/Version14x/Scribus/resources/templates/template.xml
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19166&path=/branches/Version14x/Scribus/resources/templates/template.xml
==============================================================================
--- branches/Version14x/Scribus/resources/templates/template.xml (original)
+++ branches/Version14x/Scribus/resources/templates/template.xml Sun Jun  1 21:35:57 2014
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf8"?>
 <templates>
 	<template category="Newsletters">
-		<name>Newsletter_1</name>
+		<name>Newsletter 1</name>
     	<file>nl1/nl1.sla.gz</file>
     	<tnail>nl1/nl1tn.png</tnail>
     	<img>nl1/nl1.png</img>
     	<psize>A4</psize>
     	<color>2 colors, green and orange</color>
-    	<descr>Simple newsletter template</descr>
+    	<descr>Simple newsletter template.</descr>
     	<usage>Right click on text and image frames and replace what's inside with your own. Images are free to be used in your documents as well.</usage>
     	<scribus_version>1.2RC1cvs</scribus_version>
 		<date>2004-07-11</date>
@@ -15,13 +15,13 @@
     	<email>tsoots at gmail.com</email>
 	</template>
 	<template category="Newsletters">
-  		<name>Newsletter_2</name>
+  		<name>Newsletter 2</name>
     	<file>nl2/nl2.sla.gz</file>
     	<tnail>nl2/nl2tn.png</tnail>
     	<img>nl2/nl2.png</img>
     	<psize>A4</psize>
     	<color>b/w</color>
-    	<descr>Simple newsletter template</descr>
+    	<descr>Simple newsletter template.</descr>
     	<usage>Right click on text and image frames and replace what's inside with your own. Images are free to be used in your documents as well.</usage>
 		<scribus_version>1.2RC1cvs</scribus_version>
 		<date>2004-07-11</date>
@@ -29,12 +29,12 @@
     	<email>tsoots at gmail.com</email>
   	</template>
 	<template category="Brochures">
-  		<name>Brochure_1</name>
+  		<name>Brochure 1</name>
     	<file>br1/br1.sla.gz</file>
     	<tnail>br1/br1tn.png</tnail>
     	<img>br1/br1.png</img>
     	<psize>A4</psize>
-    	<color>color</color>
+    	<color>Color</color>
     	<descr>Simple brochure with a colorful fruity theme.</descr>
     	<usage>Right click on text replace what's inside with your own.</usage>
     	<scribus_version>1.2RC1cvs</scribus_version>
@@ -48,7 +48,7 @@
 		<tnail>textbased/textbasedtn.png</tnail>
 		<img>textbased/textbased.png</img>
 		<psize>A4</psize>
-		<color>color</color>
+		<color>Color</color>
 		<descr>A decent newsletter/magazine originaly created for one non-profit organization. Unrealized unfortunately.</descr>
 		<usage>Right click on text replace what's inside with your own. Or whatever you want to... ;)</usage>
 		<scribus_version>1.2RC1cvs</scribus_version>
@@ -57,7 +57,7 @@
 		<email>petr at yarpen.cz</email>
 	</template>
 	<template category="PDF Presentations">
-		<name>Blue_Orange</name>
+		<name>Blue Orange</name>
 		<file>pres_backgr_1/blue_orange_vector.sla.gz</file>
 		<tnail>pres_backgr_1/blue_orange_vectortn.png</tnail>
 		<img>pres_backgr_1/blue_orange_vector.png</img>
@@ -71,13 +71,13 @@
 		<email></email>
 	</template>
 	<template category="PDF Presentations">
-		<name>Flood_Light</name>
+		<name>Flood Light</name>
 		<file>pres_backgr_2/flood_light.sla.gz</file>
 		<tnail>pres_backgr_2/flood_lighttn.png</tnail>
 		<img>pres_backgr_2/flood_light.png</img>
 		<psize>custom, 842x632</psize>
 		<color>RGB</color>
-		<descr>Presentation Background</descr>
+		<descr>Presentation Background.</descr>
 		<usage></usage>
 		<scribus_version>1.3.9.svn</scribus_version>
 		<date>2010-10-25</date>
@@ -85,7 +85,7 @@
 		<email></email>
 	</template>
 	<template category="PDF Presentations">
-		<name>Glass_Ripples</name>
+		<name>Glass Ripples</name>
 		<file>pres_backgr_3/glass_ripples.sla.gz</file>
 		<tnail>pres_backgr_3/glass_ripplestn.png</tnail>
 		<img>pres_backgr_3/glass_ripples.png</img>
@@ -113,12 +113,12 @@
 		<email></email>
 	</template>
 	<template category="Packaging">
-		<name>Cheat_Cube</name>
+		<name>Cheat Cube</name>
 		<file>cc/Cheat_Cube.sla.gz</file>
 		<tnail>cc/Cheat_Cubetn.png</tnail>
 		<img>cc/Cheat_Cube.png</img>
 		<psize>custom, 1052x744</psize>
-		<color>color</color>
+		<color>Color</color>
 		<descr></descr>
 		<usage></usage>
 		<scribus_version>1.3.9.svn</scribus_version>
@@ -127,13 +127,13 @@
 		<email></email>
 	</template>
 	<template category="Cards">
-		<name>menu_template1</name>
+		<name>Menu template 1</name>
 		<file>mc/menu_template1.sla.gz</file>
 		<tnail>mc/menu_template1tn.png</tnail>
 		<img>mc/menu_template1.png</img>
 		<psize>custom, 1224x792</psize>
-		<color>color</color>
-		<descr>Simple menu card template</descr>
+		<color>Color</color>
+		<descr>Simple menu card template.</descr>
 		<usage></usage>
 		<scribus_version>1.3.9.svn</scribus_version>
 		<date>2010-10-18</date>
@@ -141,7 +141,7 @@
 		<email></email>
 	</template>
 	<template category="Brochures">
-		<name>cover1</name>
+		<name>Cover 1</name>
 		<file>cover1/cover1.sla.gz</file>
 		<tnail>cover1/cover1tn.png</tnail>
 		<img>cover1/cover1.png</img>
@@ -155,7 +155,7 @@
 		<email></email>
 	</template>
 	<template category="Brochures">
-		<name>cover2</name>
+		<name>Cover 2</name>
 		<file>cover2/cover2.sla.gz</file>
 		<tnail>cover2/cover2tn.png</tnail>
 		<img>cover2/cover2.png</img>
@@ -169,7 +169,7 @@
 		<email></email>
 	</template>
 	<template category="Brochures">
-		<name>cover3</name>
+		<name>Cover 3</name>
 		<file>cover3/cover3.sla.gz</file>
 		<tnail>cover3/cover3tn.png</tnail>
 		<img>cover3/cover3.png</img>
@@ -183,7 +183,7 @@
 		<email></email>
 	</template>
 	<template category="Brochures">
-		<name>cover4</name>
+		<name>Cover 4</name>
 		<file>cover4/cover4.sla.gz</file>
 		<tnail>cover4/cover4tn.png</tnail>
 		<img>cover4/cover4.png</img>
@@ -197,7 +197,7 @@
 		<email></email>
 	</template>
 	<template category="Brochures">
-		<name>cover5</name>
+		<name>Cover 5</name>
 		<file>cover5/cover5.sla.gz</file>
 		<tnail>cover5/cover5tn.png</tnail>
 		<img>cover5/cover5.png</img>
@@ -210,288 +210,288 @@
 		<author>vectorportal.com</author>
 		<email></email>
 	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_A4_L</name>
+	<template category="Grids">
+		<name>Brochure Grid A4 L</name>
 		<file>grid_br_a4_l/Brochure_Grid_A4_L.sla.gz</file>
 		<tnail>grid_br_a4_l/Brochure_Grid_A4_Ltn.png</tnail>
 		<img>grid_br_a4_l/Brochure_Grid_A4_L.png</img>
 		<psize>custom, 1684x596</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A4 brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_A4_P</name>
+		<descr>A design grid for an A4 brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid A4 P</name>
 		<file>grid_br_a4_p/Brochure_Grid_A4_P.sla.gz</file>
 		<tnail>grid_br_a4_p/Brochure_Grid_A4_Ptn.png</tnail>
 		<img>grid_br_a4_p/Brochure_Grid_A4_P.png</img>
 		<psize>custom, 1191x842</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A4 brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_975x85_in_L</name>
+		<descr>A design grid for an A4 brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 975x85 in L</name>
 		<file>grid_br_975x85in_l/Brochure_Grid_975x85in_L.sla.gz</file>
 		<tnail>grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png</tnail>
 		<img>grid_br_975x85in_l/Brochure_Grid_975x85_in_L.png</img>
 		<psize>custom, 1404x612</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 9.75x8.5 in brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_975x85_in_P</name>
+		<descr>A design grid for a 9.75x8.5 in brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 975x85 in P</name>
 		<file>grid_br_975x85_p/Brochure_Grid_975x85in_P.sla.gz</file>
 		<tnail>grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png</tnail>
 		<img>grid_br_975x85_p/Brochure_Grid_975x85_in_P.png</img>
 		<psize>custom, 1224x702</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 9.75x8.5 in brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_375x85_in_P</name>
+		<descr>A design grid for a 9.75x8.5 in brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 375x85 in P</name>
 		<file>grid_br_375x85_p/Brochure_Grid_375x85in_P.sla.gz</file>
 		<tnail>grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png</tnail>
 		<img>grid_br_375x85_p/Brochure_Grid_375x85_in_P.png</img>
 		<psize>custom, 540x613</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 3.75x8.5 in brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_375x85_in_L</name>
+		<descr>A design grid for a 3.75x8.5 in brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 375x85 in L</name>
 		<file>grid_br_375x85_l/Brochure_Grid_375x85in_L.sla.gz</file>
 		<tnail>grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png</tnail>
 		<img>grid_br_375x85_l/Brochure_Grid_375x85_in_Landscape.png</img>
 		<psize>custom, 1224x270</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 3.75x8.5 in brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_100x210_P</name>
+		<descr>A design grid for a 3.75x8.5 in brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 100x210 P</name>
 		<file>grid_br_100x210_p/Brochure_Grid_100x210_P.sla.gz</file>
 		<tnail>grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png</tnail>
 		<img>grid_br_100x210_p/Brochure_Grid_100x210_P.png</img>
 		<psize>custom, 567x596</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 100x210 mm portrait brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_100x210_L</name>
+		<descr>A design grid for a 100x210 mm portrait brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 100x210 L</name>
 		<file>grid_br_100x210_l/Brochure_Grid_100x210_L.sla.gz</file>
 		<tnail>grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png</tnail>
 		<img>grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscape.png</img>
 		<psize>custom, 1191x284</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 100x210 mm landcsape brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_55x85in_P</name>
+		<descr>A design grid for a 100x210 mm landscape brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 55x85 in P</name>
 		<file>grid_br_55x86in_p/Brochure_Grid_55x85in_P.sla.gz</file>
 		<tnail>grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png</tnail>
 		<img>grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoit.png</img>
 		<psize>custom, 792x613</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 5.5x8.5 in brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_55x85in_L</name>
+		<descr>A design grid for a 5.5x8.5 in brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid 55x85 in L</name>
 		<file>grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz</file>
 		<tnail>grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png</tnail>
 		<img>grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png</img>
 		<psize>custom, 1224x396</psize>
 		<color>RGB</color>
-		<descr>A design grid for a 5.5x8.5 in brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Posters">
-		<name>Poster_Grid_A3</name>
+		<descr>A design grid for a 5.5x8.5 in brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Poster Grid A3</name>
 		<file>grid_poster_a3/Poster_Grid_A3.sla.gz</file>
 		<tnail>grid_poster_a3/Poster_Grid_A3tn.png</tnail>
 		<img>grid_poster_a3/Poster_Grid_A3.png</img>
 		<psize>custom, 842x1191</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A3 poster</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Posters">
-		<name>Poster_Grid_A2</name>
+		<descr>A design grid for an A3 poster.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Poster Grid A2</name>
 		<file>grid_poster_a2/Poster_Grid_A2.sla.gz</file>
 		<tnail>grid_poster_a2/Poster_Grid_A2tn.png</tnail>
 		<img>grid_poster_a2/Poster_Grid_A2.png</img>
 		<psize>custom, 1191x1684</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A2 poster</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Posters">
-		<name>Poster_Grid_A1</name>
+		<descr>A design grid for an A2 poster.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Poster Grid A1</name>
 		<file>grid_poster_a1/Poster_Grid_A1.sla.gz</file>
 		<tnail>grid_poster_a1/Poster_Grid_A1tn.png</tnail>
 		<img>grid_poster_a1/Poster_Grid_A1.png</img>
 		<psize>custom, 1684x2384</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A1 poster</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Posters">
-		<name>Poster_Grid_A0</name>
+		<descr>A design grid for an A1 poster.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Poster Grid A0</name>
 		<file>grid_poster_a0/Poster_Grid_A0.sla.gz</file>
 		<tnail>grid_poster_a0/Poster_Grid_A0tn.png</tnail>
 		<img>grid_poster_a0/Poster_Grid_A0.png</img>
 		<psize>custom, 2384x3371</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A0 poster</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-24</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_USL_P</name>
+		<descr>A design grid for an A0 poster.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-24</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid USL P</name>
 		<file>grid_br_usl_p/Brochure_Grid_USL_P.sla.gz</file>
 		<tnail>grid_br_usl_p/Brochure_Grid_USL_Ptn.png</tnail>
 		<img>grid_br_usl_p/Brochure_Grid_USL_P.png</img>
 		<psize>custom, 1224x792</psize>
 		<color>RGB</color>
-		<descr>A design grid for a US Letter brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_USL_L</name>
+		<descr>A design grid for a US Letter brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid USL L</name>
 		<file>grid_br_usl_l/Brochure_Grid_USL_L.sla.gz</file>
 		<tnail>grid_br_usl_l/Brochure_Grid_USL_Ltn.png</tnail>
 		<img>grid_br_usl_l/Brochure Grid_USL_L.png</img>
 		<psize>custom, 1584x612</psize>
 		<color>RGB</color>
-		<descr>A design grid for a US Letter brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_DIN_LANG P</name>
+		<descr>A design grid for a US Letter brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid DIN LANG P</name>
 		<file>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.sla.gz</file>
 		<tnail>grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png</tnail>
 		<img>grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png</img>
 		<psize>custom, 596x596</psize>
 		<color>RGB</color>
-		<descr>A design grid for a DIN LANG brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_DIN_LANG_L</name>
+		<descr>A design grid for a DIN LANG brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid DIN LANG L</name>
 		<file>grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.sla.gz</file>
 		<tnail>grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png</tnail>
 		<img>grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.png</img>
 		<psize>custom, 1191x298</psize>
 		<color>RGB</color>
-		<descr>A design grid for a DIN LANG brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_A5_P</name>
+		<descr>A design grid for a DIN LANG brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid A5 P</name>
 		<file>grid_br_a5_p/Brochure_Grid_A5_P.sla.gz</file>
 		<tnail>grid_br_a5_p/Brochure_Grid_A5_Portraittn.png</tnail>
 		<img>grid_br_a5_p/Brochure_Grid_A5_Portrait.png</img>
 		<psize>custom, 840x596</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A5 brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Brochures">
-		<name>Brochure_Grid_A5_L</name>
+		<descr>A design grid for an A5 brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Grids">
+		<name>Brochure Grid A5 L</name>
 		<file>grid_br_a5_l/Brochure_Grid_A5_L.sla.gz</file>
 		<tnail>grid_br_a5_l/Brochure_Grid_A5_Ltn.png</tnail>
 		<img>grid_br_a5_l/Brochure_Grid_A5_L.png</img>
 		<psize>custom, 1191x420</psize>
 		<color>RGB</color>
-		<descr>A design grid for an A5 brochure</descr>
-		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
-		<scribus_version>1.3.9.svn</scribus_version>
-		<date>2010-10-23</date>
-		<author>Christoph Schäfer</author>
-		<email></email>
-	</template>
-	<template category="Business Cards">
-		<name>Business_Card_Collection</name>
+		<descr>A design grid for an A5 brochure.</descr>
+		<usage>Create your content on the "Content" layer and disable printing of the "Background" layer before printing or exporting to PDF.</usage>
+		<scribus_version>1.3.9.svn</scribus_version>
+		<date>2010-10-23</date>
+		<author>Christoph Schäfer</author>
+		<email></email>
+	</template>
+	<template category="Business Cards">
+		<name>Business Card Collection</name>
 		<file>buscard_coll/business_card_collection.sla.gz</file>
 		<tnail>buscard_coll/Business_Card_Collectiontn.png</tnail>
 		<img>buscard_coll/Business_Card_Collection.png</img>
@@ -505,7 +505,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_1</name>
+		<name>Business Card 1</name>
 		<file>buscard1/buscard1.sla.gz</file>
 		<tnail>buscard1/Business_Card_1tn.png</tnail>
 		<img>buscard1/Business_Card_1.png</img>
@@ -519,7 +519,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_2</name>
+		<name>Business Card 2</name>
 		<file>buscard2/buscard2.sla.gz</file>
 		<tnail>buscard2/Business_Card_2tn.png</tnail>
 		<img>buscard2/Business_Card_2.png</img>
@@ -533,7 +533,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_3</name>
+		<name>Business Card 3</name>
 		<file>buscard3/buscard3.sla.gz</file>
 		<tnail>buscard3/Business_Card_3tn.png</tnail>
 		<img>buscard3/Business_Card_3.png</img>
@@ -547,7 +547,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_4</name>
+		<name>Business Card 4</name>
 		<file>buscard4/buscard4.sla.gz</file>
 		<tnail>buscard4/Business_Card_4tn.png</tnail>
 		<img>buscard4/Business_Card_4.png</img>
@@ -561,7 +561,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_5</name>
+		<name>Business Card 5</name>
 		<file>buscard5/buscard5.sla.gz</file>
 		<tnail>buscard5/Business_Card_5tn.png</tnail>
 		<img>buscard5/Business_Card_5.png</img>
@@ -575,7 +575,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_6</name>
+		<name>Business Card 6</name>
 		<file>buscard6/buscard6.sla.gz</file>
 		<tnail>buscard6/Business_Card_6tn.png</tnail>
 		<img>buscard6/Business_Card_6.png</img>
@@ -589,7 +589,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_7</name>
+		<name>Business Card 7</name>
 		<file>buscard7/buscard7.sla.gz</file>
 		<tnail>buscard7/Business_Card_7tn.png</tnail>
 		<img>buscard7/Business_Card_7.png</img>
@@ -603,7 +603,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_8</name>
+		<name>Business Card 8</name>
 		<file>buscard8/buscard8.sla.gz</file>
 		<tnail>buscard8/Business_Card_8tn.png</tnail>
 		<img>buscard8/Business_Card_8.png</img>
@@ -617,7 +617,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_9</name>
+		<name>Business Card 9</name>
 		<file>buscard9/buscard9.sla.gz</file>
 		<tnail>buscard9/Business_Card_9tn.png</tnail>
 		<img>buscard9/Business_Card_9.png</img>
@@ -631,7 +631,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_10</name>
+		<name>Business Card 10</name>
 		<file>buscard10/buscard10.sla.gz</file>
 		<tnail>buscard10/Business_Card_10tn.png</tnail>
 		<img>buscard10/Business_Card_10.png</img>
@@ -645,7 +645,7 @@
 		<email></email>
 	</template>
 	<template category="Business Cards">
-		<name>Business_Card_11</name>
+		<name>Business Card 11</name>
 		<file>buscard11/buscard11.sla.gz</file>
 		<tnail>buscard11/Business_Card_11tn.png</tnail>
 		<img>buscard11/Business_Card_11.png</img>

Modified: branches/Version14x/Scribus/scribus/nftrcreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19166&path=/branches/Version14x/Scribus/scribus/nftrcreader.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/nftrcreader.cpp (original)
+++ branches/Version14x/Scribus/scribus/nftrcreader.cpp Sun Jun  1 21:35:57 2014
@@ -1,233 +1,234 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-/***************************************************************************
- *   Riku Leino, tsoots at gmail.com                                          *
- ***************************************************************************/
-
-#include "nftrcreader.h"
-
-using namespace std;
-
-nftrcreader::nftrcreader(std::vector<nfttemplate*> *tmplts,QString sourceDir)
-{
-	templates = tmplts;
-	currentDir = sourceDir;
-	setupCategories();
-}
-
-bool nftrcreader::startDocument()
-{
-	inSettings       = false;
-	inTemplate       = false;
-	inName           = false;
-	inFile           = false;
-	inTNail          = false;
-	inImg            = false;
-	inPSize          = false;
-	inColor          = false;
-	inDescr          = false;
-	inUsage          = false;
-	inScribusVersion = false;
-	inDate           = false;
-	inAuthor         = false;
-	inEmail          = false;
-	return true;
-}
-
-bool nftrcreader::startElement(const QString&, const QString&, const QString &name, const QXmlAttributes &attrs) 
-{
-	if (name == "name")
-		inName = true;
-	else if (name == "file")
-		inFile = true;
-	else if (name == "tnail")
-		inTNail = true;
-	else if (name == "img")
-		inImg = true;
-	else if (name == "psize")
-		inPSize = true;
-	else if (name == "color") 
-		inColor = true;
-	else if (name == "descr")
-		inDescr = true;
-	else if (name == "usage")
-		inUsage = true;
-	else if (name == "scribus_version")
-		inScribusVersion = true;
-	else if (name == "date")
-		inDate = true;
-	else if (name == "author")
-		inAuthor = true;
-	else if (name == "email")
-		inEmail = true;
-
-
-	if (name == "template") // new template starts here
-	{
-		inTemplate = true;
-		QString category;
-		QString enCat;
-		for (int i = 0; i < attrs.count(); i++)
-		{
-			if (attrs.localName(i) == "category")
-			{
-				category = getCategory(attrs.value(i));
-				enCat = attrs.value(i);
-			}
-		}
-		tmpTemplate = new nfttemplate(currentFile, category); // create a new template
-		tmpTemplate->enCategory = enCat;
-	}
-
-	if (name == "settings") 
-		inSettings = true;
-
-	return true;
-}
-
-bool nftrcreader::characters(const QString &ch) 
-{
-	QString tmp(ch);
-	if (inName)
-		tmpTemplate->name = tmp;
-	else if (inFile)
-	{
-		if (tmp.left(1) == "/")
-			tmpTemplate->file = tmp;
-		else 
-			tmpTemplate->file = currentDir + "/" + tmp;
-	} else if (inTNail)
-	{
-		if (tmp.left(1) == "/")
-			tmpTemplate->tnail = tmp;
-		else
-			tmpTemplate->tnail = currentDir + "/" + tmp;
-	} else if (inImg)
-	{
-		if (tmp.left(1) == "/") 
-			tmpTemplate->img = tmp;
-		else
-			tmpTemplate->img = currentDir + "/" + tmp;
-	} else if (inPSize)
-		tmpTemplate->psize = tmp; 
-	else if (inColor)
-		tmpTemplate->color = tmp; 
-	else if (inDescr)
-		tmpTemplate->descr = tmp; 
-	else if (inUsage)
-		tmpTemplate->usage = tmp;
-	else if (inScribusVersion)
-		tmpTemplate->scribusVersion = tmp;
-	else if (inDate)
-		tmpTemplate->date = tmp;
-	else if (inAuthor)
-		tmpTemplate->author = tmp;
-	else if (inEmail)
-		tmpTemplate->email = tmp; 
-
-	return true;
-}
-
-bool nftrcreader::endElement(const QString&, const QString&, const QString &name)
-{
-	if (name == "template")
-	{ // new template starts here
-		inTemplate = false;
-		if (tmpTemplate != NULL) // If we have a template already created
-		{
-			if (tmpTemplate->isValid()) // and the template really exists push
-				templates->push_back(tmpTemplate); // it to the templates vector and start a new one
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+/***************************************************************************
+ *   Riku Leino, tsoots at gmail.com                                          *
+ ***************************************************************************/
+
+#include "nftrcreader.h"
+
+using namespace std;
+
+nftrcreader::nftrcreader(std::vector<nfttemplate*> *tmplts,QString sourceDir)
+{
+	templates = tmplts;
+	currentDir = sourceDir;
+	setupCategories();
+}
+
+bool nftrcreader::startDocument()
+{
+	inSettings       = false;
+	inTemplate       = false;
+	inName           = false;
+	inFile           = false;
+	inTNail          = false;
+	inImg            = false;
+	inPSize          = false;
+	inColor          = false;
+	inDescr          = false;
+	inUsage          = false;
+	inScribusVersion = false;
+	inDate           = false;
+	inAuthor         = false;
+	inEmail          = false;
+	return true;
+}
+
+bool nftrcreader::startElement(const QString&, const QString&, const QString &name, const QXmlAttributes &attrs) 
+{
+	if (name == "name")
+		inName = true;
+	else if (name == "file")
+		inFile = true;
+	else if (name == "tnail")
+		inTNail = true;
+	else if (name == "img")
+		inImg = true;
+	else if (name == "psize")
+		inPSize = true;
+	else if (name == "color") 
+		inColor = true;
+	else if (name == "descr")
+		inDescr = true;
+	else if (name == "usage")
+		inUsage = true;
+	else if (name == "scribus_version")
+		inScribusVersion = true;
+	else if (name == "date")
+		inDate = true;
+	else if (name == "author")
+		inAuthor = true;
+	else if (name == "email")
+		inEmail = true;
+
+
+	if (name == "template") // new template starts here
+	{
+		inTemplate = true;
+		QString category;
+		QString enCat;
+		for (int i = 0; i < attrs.count(); i++)
+		{
+			if (attrs.localName(i) == "category")
+			{
+				category = getCategory(attrs.value(i));
+				enCat = attrs.value(i);
+			}
+		}
+		tmpTemplate = new nfttemplate(currentFile, category); // create a new template
+		tmpTemplate->enCategory = enCat;
+	}
+
+	if (name == "settings") 
+		inSettings = true;
+
+	return true;
+}
+
+bool nftrcreader::characters(const QString &ch) 
+{
+	QString tmp(ch);
+	if (inName)
+		tmpTemplate->name = tmp;
+	else if (inFile)
+	{
+		if (tmp.left(1) == "/")
+			tmpTemplate->file = tmp;
+		else 
+			tmpTemplate->file = currentDir + "/" + tmp;
+	} else if (inTNail)
+	{
+		if (tmp.left(1) == "/")
+			tmpTemplate->tnail = tmp;
+		else
+			tmpTemplate->tnail = currentDir + "/" + tmp;
+	} else if (inImg)
+	{
+		if (tmp.left(1) == "/") 
+			tmpTemplate->img = tmp;
+		else
+			tmpTemplate->img = currentDir + "/" + tmp;
+	} else if (inPSize)
+		tmpTemplate->psize = tmp; 
+	else if (inColor)
+		tmpTemplate->color = tmp; 
+	else if (inDescr)
+		tmpTemplate->descr = tmp; 
+	else if (inUsage)
+		tmpTemplate->usage = tmp;
+	else if (inScribusVersion)
+		tmpTemplate->scribusVersion = tmp;
+	else if (inDate)
+		tmpTemplate->date = tmp;
+	else if (inAuthor)
+		tmpTemplate->author = tmp;
+	else if (inEmail)
+		tmpTemplate->email = tmp; 
+
+	return true;
+}
+
+bool nftrcreader::endElement(const QString&, const QString&, const QString &name)
+{
+	if (name == "template")
+	{ // new template starts here
+		inTemplate = false;
+		if (tmpTemplate != NULL) // If we have a template already created
+		{
+			if (tmpTemplate->isValid()) // and the template really exists push
+				templates->push_back(tmpTemplate); // it to the templates vector and start a new one
 			else
 			{
 				delete tmpTemplate;
 				tmpTemplate = 0;
-			}
-		}
-	}
-	if (inTemplate) {
-		if (inName && name == "name")
-			inName = false;
-		else if (inFile && name == "file")
-			inFile = false;
-		else if (inTNail && name == "tnail")
-			inTNail = false;
-		else if (inImg && name == "img")
-			inImg = false;
-		else if (inPSize && name == "psize")
-			inPSize = false;
-		else if (inColor && name == "color") 
-			inColor = false;
-		else if (inDescr && name == "descr")
-			inDescr = false;
-		else if (inUsage && name == "usage")
-			inUsage = false;
-		else if (inScribusVersion && name == "scribus_version")
-			inScribusVersion = false;
-		else if (inDate && name == "date")
-			inDate = false;
-		else if (inAuthor && name == "author")
-			inAuthor = false;
-		else if (inEmail && name == "email")
-			inEmail = false;
-		else if (inTemplate && name == "template")
-			inTemplate = false;
-	}
-	
-	if (inSettings && name == "settings")
-		inSettings = false;
-
-	return true;
-}
-
-void nftrcreader::setSourceDir(QString source) 
-{
-	currentDir = source;
-}
-
-void nftrcreader::setSourceFile(QString sourceFile)
-{
-	currentFile = sourceFile;
-}
-
-QString nftrcreader::getCategory(QString cat) 
-{
-	QMap<QString, QString>::iterator it = cats.find(cat);
-	if (it==cats.end())
-		cats.insert(cat, cat);
-	if (it != cats.end())
-		return it.value();
-	return cat;
-}
-
-void nftrcreader::setupCategories()
-{
-	// en will be used in template.xml and it will be then replaced with the lang when used for users
-	// to get the categories in their language.
-	cats.insert(QString("Newsletters"), QObject::tr("Newsletters"));
-	cats.insert(QString("Brochures")  , QObject::tr("Brochures"));
-	cats.insert(QString("Catalogs")   , QObject::tr("Catalogs"));
-	cats.insert(QString("Flyers")     , QObject::tr("Flyers"));
-	cats.insert(QString("Signs")      , QObject::tr("Signs"));
-	cats.insert(QString("Cards")      , QObject::tr("Cards"));
-	cats.insert(QString("Letterheads"), QObject::tr("Letterheads"));
-	cats.insert(QString("Envelopes")  , QObject::tr("Envelopes"));
-	cats.insert(QString("Business Cards"), QObject::tr("Business Cards"));
-	cats.insert(QString("Calendars")  , QObject::tr("Calendars"));
-	cats.insert(QString("Advertisements"), QObject::tr("Advertisements"));
-	cats.insert(QString("Labels")     , QObject::tr("Labels"));
-	cats.insert(QString("Menus")      , QObject::tr("Menus"));
-	cats.insert(QString("Programs")   , QObject::tr("Programs"));
-	cats.insert(QString("PDF Forms")  , QObject::tr("PDF Forms"));
-	cats.insert(QString("PDF Presentations") , QObject::tr("PDF Presentations"));
-	cats.insert(QString("Magazines")  , QObject::tr("Magazines"));
-	cats.insert(QString("Posters")    , QObject::tr("Posters"));
-	cats.insert(QString("Announcements") , QObject::tr("Announcements"));
-	cats.insert(QString("Text Documents"), QObject::tr("Text Documents"));
-	cats.insert(QString("Folds")        , QObject::tr("Folds"));
-	cats.insert(QString("Media Cases")  , QObject::tr("Media Cases"));
-	cats.insert(QString("Own Templates"), QObject::tr("Own Templates"));
-}
+			}
+		}
+	}
+	if (inTemplate) {
+		if (inName && name == "name")
+			inName = false;
+		else if (inFile && name == "file")
+			inFile = false;
+		else if (inTNail && name == "tnail")
+			inTNail = false;
+		else if (inImg && name == "img")
+			inImg = false;
+		else if (inPSize && name == "psize")
+			inPSize = false;
+		else if (inColor && name == "color") 
+			inColor = false;
+		else if (inDescr && name == "descr")
+			inDescr = false;
+		else if (inUsage && name == "usage")
+			inUsage = false;
+		else if (inScribusVersion && name == "scribus_version")
+			inScribusVersion = false;
+		else if (inDate && name == "date")
+			inDate = false;
+		else if (inAuthor && name == "author")
+			inAuthor = false;
+		else if (inEmail && name == "email")
+			inEmail = false;
+		else if (inTemplate && name == "template")
+			inTemplate = false;
+	}
+	
+	if (inSettings && name == "settings")
+		inSettings = false;
+
+	return true;
+}
+
+void nftrcreader::setSourceDir(QString source) 
+{
+	currentDir = source;
+}
+
+void nftrcreader::setSourceFile(QString sourceFile)
+{
+	currentFile = sourceFile;
+}
+
+QString nftrcreader::getCategory(QString cat) 
+{
+	QMap<QString, QString>::iterator it = cats.find(cat);
+	if (it==cats.end())
+		cats.insert(cat, cat);
+	if (it != cats.end())
+		return it.value();
+	return cat;
+}
+
+void nftrcreader::setupCategories()
+{
+	// en will be used in template.xml and it will be then replaced with the lang when used for users
+	// to get the categories in their language.
+	cats.insert(QString("Advertisements"), QObject::tr("Advertisements"));
+	cats.insert(QString("Announcements") , QObject::tr("Announcements"));
+	cats.insert(QString("Brochures")  , QObject::tr("Brochures"));
+	cats.insert(QString("Business Cards"), QObject::tr("Business Cards"));
+	cats.insert(QString("Calendars")  , QObject::tr("Calendars"));
+	cats.insert(QString("Cards")      , QObject::tr("Cards"));
+	cats.insert(QString("Catalogs")   , QObject::tr("Catalogs"));
+	cats.insert(QString("Envelopes")  , QObject::tr("Envelopes"));
+	cats.insert(QString("Flyers")     , QObject::tr("Flyers"));
+	cats.insert(QString("Folds")      , QObject::tr("Folds"));
+	cats.insert(QString("Grids")      , QObject::tr("Grids"));
+	cats.insert(QString("Labels")     , QObject::tr("Labels"));
+	cats.insert(QString("Letterheads"), QObject::tr("Letterheads"));
+	cats.insert(QString("Magazines")  , QObject::tr("Magazines"));
+	cats.insert(QString("Media Cases")  , QObject::tr("Media Cases"));
+	cats.insert(QString("Menus")      , QObject::tr("Menus"));
+	cats.insert(QString("Newsletters"), QObject::tr("Newsletters"));
+	cats.insert(QString("Own Templates"), QObject::tr("Own Templates"));
+	cats.insert(QString("PDF Forms")  , QObject::tr("PDF Forms"));
+	cats.insert(QString("PDF Presentations") , QObject::tr("PDF Presentations"));
+	cats.insert(QString("Posters")    , QObject::tr("Posters"));
+	cats.insert(QString("Programs")   , QObject::tr("Programs"));
+	cats.insert(QString("Signs")      , QObject::tr("Signs"));
+	cats.insert(QString("Text Documents"), QObject::tr("Text Documents"));
+}




More information about the scribus-commit mailing list