[dia] Use gettext to translate sheets
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] Use gettext to translate sheets
- Date: Sat, 25 May 2019 12:45:49 +0000 (UTC)
commit c18b809fbc6237642204d310b3cc6d5978d1eb44
Author: Zander Brown <zbrown gnome org>
Date: Sat May 25 13:20:45 2019 +0100
Use gettext to translate sheets
Now we can drop outdated intltool hacks and generally make life simpler
Unfortunatly i'm pretty sure this complicates things for translators
BUILDING.md | 3 +-
po/.gitignore | 1 -
po/POTFILES.in | 74 +++++++-------
po/its/sheet.its | 9 ++
po/its/sheet.loc | 6 ++
po/meson.build | 12 +--
po/update_pofiles_in.sh | 15 ---
sheets/{AADL.sheet.in => AADL.sheet} | 28 ++---
sheets/Assorted.sheet | 102 +++++++++++++++++++
sheets/Assorted.sheet.in | 102 -------------------
sheets/{BPMN.sheet.in => BPMN.sheet} | 88 ++++++++--------
sheets/ChemEng.sheet | 64 ++++++++++++
sheets/ChemEng.sheet.in | 64 ------------
sheets/{Circuit.sheet.in => Circuit.sheet} | 68 ++++++-------
sheets/{Contact.sheet.in => Contact.sheet} | 28 ++---
sheets/{Cybernetics.sheet.in => Cybernetics.sheet} | 64 ++++++------
sheets/{Database.sheet.in => Database.sheet} | 10 +-
sheets/{ER.sheet.in => ER.sheet} | 14 +--
sheets/{Electric.sheet.in => Electric.sheet} | 34 +++----
sheets/{FS.sheet.in => FS.sheet} | 10 +-
sheets/{Flowchart.sheet.in => Flowchart.sheet} | 62 +++++------
sheets/{GRAFCET.sheet.in => GRAFCET.sheet} | 28 ++---
...e_and_Sarson.sheet.in => Gane_and_Sarson.sheet} | 12 +--
sheets/IsometricMap.sheet | 70 +++++++++++++
sheets/IsometricMap.sheet.in | 70 -------------
sheets/{Istar.sheet.in => Istar.sheet} | 32 +++---
sheets/Jackson.sheet | 28 +++++
sheets/Jackson.sheet.in | 28 -----
sheets/{KAOS.sheet.in => KAOS.sheet} | 46 ++++-----
sheets/Lights.sheet | 48 +++++++++
sheets/Lights.sheet.in | 48 ---------
sheets/{Logic.sheet.in => Logic.sheet} | 22 ++--
sheets/{MSE.sheet.in => MSE.sheet} | 16 +--
sheets/{Misc.sheet.in => Misc.sheet} | 24 ++---
sheets/{Pneumatic.sheet.in => Pneumatic.sheet} | 48 ++++-----
sheets/{SADT.sheet.in => SADT.sheet} | 10 +-
sheets/{SDL.sheet.in => SDL.sheet} | 38 +++----
.../{Shape_Design.sheet.in => Shape_Design.sheet} | 10 +-
sheets/{UML.sheet.in => UML.sheet} | 64 ++++++------
sheets/{chronogram.sheet.in => chronogram.sheet} | 8 +-
sheets/ciscocomputer.sheet | 60 +++++++++++
sheets/ciscocomputer.sheet.in | 60 -----------
sheets/ciscohub.sheet | 78 ++++++++++++++
sheets/ciscohub.sheet.in | 78 --------------
sheets/ciscomisc.sheet | 67 ++++++++++++
sheets/ciscomisc.sheet.in | 67 ------------
sheets/cisconetwork.sheet | 113 +++++++++++++++++++++
sheets/cisconetwork.sheet.in | 113 ---------------------
sheets/ciscotelephony.sheet | 61 +++++++++++
sheets/ciscotelephony.sheet.in | 61 -----------
sheets/{civil.sheet.in => civil.sheet} | 58 +++++------
sheets/{jigsaw.sheet.in => jigsaw.sheet} | 36 +++----
sheets/meson.build | 12 +--
sheets/{network.sheet.in => network.sheet} | 78 +++++++-------
sheets/{sybase.sheet.in => sybase.sheet} | 16 +--
55 files changed, 1226 insertions(+), 1240 deletions(-)
---
diff --git a/BUILDING.md b/BUILDING.md
index 4d1379d2..b47e95a9 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -17,7 +17,7 @@ Dia is currently built using [meson](https://github.com/mesonbuild/meson). Meso
Build requirements are documented in the root [meson.build](/meson.build) file. Meson is designed to be
readable so please have a skim through the file. Some dependencies are required, while others are optional.
-As can be seen from `meson.build`, the main requirements are **GTK2**, **libxml2** and **zlib**. Note: at
the moment, **intltool** (`intltool-merge`) is also required.
+As can be seen from `meson.build`, the main requirements are **GTK2**, **libxml2** and **zlib**.
For reference, a number of other libraries are recommended for extra features. However, not all these have
been moved to meson. It is recommended you run `meson build` (to configure the build directory) and then
check which optional dependencies are not found:
@@ -48,7 +48,6 @@ mingw-w64-x86_64-toolchain
mingw-w64-x86_64-gtk2
mingw-w64-x86_64-python2
mingw-w64-x86_64-python2-pygtk
-intltool
```
You might need to install additional packages. Please file an issue / merge request with the updated
packages to ensure others know what to install also.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 13154ec3..52569e25 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -236,40 +236,40 @@ plug-ins/xfig/xfig-export.c
plug-ins/xfig/xfig-import.c
plug-ins/xslt/xslt.c
plug-ins/xslt/xsltdialog.c
-sheets/AADL.sheet.in
-sheets/Assorted.sheet.in
-sheets/BPMN.sheet.in
-sheets/ChemEng.sheet.in
-sheets/chronogram.sheet.in
-sheets/Circuit.sheet.in
-sheets/ciscocomputer.sheet.in
-sheets/ciscohub.sheet.in
-sheets/ciscomisc.sheet.in
-sheets/cisconetwork.sheet.in
-sheets/ciscotelephony.sheet.in
-sheets/civil.sheet.in
-sheets/Contact.sheet.in
-sheets/Cybernetics.sheet.in
-sheets/Database.sheet.in
-sheets/Electric.sheet.in
-sheets/ER.sheet.in
-sheets/Flowchart.sheet.in
-sheets/FS.sheet.in
-sheets/Gane_and_Sarson.sheet.in
-sheets/GRAFCET.sheet.in
-sheets/IsometricMap.sheet.in
-sheets/Istar.sheet.in
-sheets/Jackson.sheet.in
-sheets/jigsaw.sheet.in
-sheets/KAOS.sheet.in
-sheets/Lights.sheet.in
-sheets/Logic.sheet.in
-sheets/Misc.sheet.in
-sheets/MSE.sheet.in
-sheets/network.sheet.in
-sheets/Pneumatic.sheet.in
-sheets/SADT.sheet.in
-sheets/SDL.sheet.in
-sheets/Shape_Design.sheet.in
-sheets/sybase.sheet.in
-sheets/UML.sheet.in
+sheets/AADL.sheet
+sheets/Assorted.sheet
+sheets/BPMN.sheet
+sheets/ChemEng.sheet
+sheets/chronogram.sheet
+sheets/Circuit.sheet
+sheets/ciscocomputer.sheet
+sheets/ciscohub.sheet
+sheets/ciscomisc.sheet
+sheets/cisconetwork.sheet
+sheets/ciscotelephony.sheet
+sheets/civil.sheet
+sheets/Contact.sheet
+sheets/Cybernetics.sheet
+sheets/Database.sheet
+sheets/Electric.sheet
+sheets/ER.sheet
+sheets/Flowchart.sheet
+sheets/FS.sheet
+sheets/Gane_and_Sarson.sheet
+sheets/GRAFCET.sheet
+sheets/IsometricMap.sheet
+sheets/Istar.sheet
+sheets/Jackson.sheet
+sheets/jigsaw.sheet
+sheets/KAOS.sheet
+sheets/Lights.sheet
+sheets/Logic.sheet
+sheets/Misc.sheet
+sheets/MSE.sheet
+sheets/network.sheet
+sheets/Pneumatic.sheet
+sheets/SADT.sheet
+sheets/SDL.sheet
+sheets/Shape_Design.sheet
+sheets/sybase.sheet
+sheets/UML.sheet
diff --git a/po/its/sheet.its b/po/its/sheet.its
new file mode 100644
index 00000000..1090e4af
--- /dev/null
+++ b/po/its/sheet.its
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its";
+ version="2.0">
+ <its:translateRule selector="/sheet/name |
+ /sheet/description |
+ /sheet/contents/object/description |
+ /sheet/contents/shape/name"
+ translate="yes"/>
+</its:rules>
diff --git a/po/its/sheet.loc b/po/its/sheet.loc
new file mode 100644
index 00000000..dacd4fed
--- /dev/null
+++ b/po/its/sheet.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+ <locatingRule name="sheet" pattern="*.sheet">
+ <documentRule localName="sheet" target="sheet.its"/>
+ </locatingRule>
+</locatingRules>
diff --git a/po/meson.build b/po/meson.build
index 44bfd33d..dadceab5 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,15 +1,7 @@
i18n = import('i18n')
-intltool_merge = find_program('intltool-merge')
-
po_dir = meson.current_source_dir()
-intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
-intltool_command = [
- intltool_merge, '-x', '-u',
- '-c', intltool_cache,
- po_dir, '@INPUT@', '@OUTPUT@'
-]
-
i18n.gettext(meson.project_name(),
- args: '--from-code=utf-8')
+ preset: 'glib',
+ data_dirs : '.')
diff --git a/sheets/AADL.sheet.in b/sheets/AADL.sheet
similarity index 55%
rename from sheets/AADL.sheet.in
rename to sheets/AADL.sheet
index 9770d92d..cddaff1c 100644
--- a/sheets/AADL.sheet.in
+++ b/sheets/AADL.sheet
@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>AADL</_name>
- <_description>AADL Shapes</_description>
+ <name>AADL</name>
+ <description>AADL Shapes</description>
<contents>
<!--<object name="AADL - Box">
- <_description>Process</_description>
+ <description>Process</description>
</object>-->
<object name="AADL - Process">
- <_description>Process</_description>
+ <description>Process</description>
</object>
<object name="AADL - Thread">
- <_description>Thread</_description>
+ <description>Thread</description>
</object>
<object name="AADL - Data">
- <_description>Data</_description>
+ <description>Data</description>
</object>
<object name="AADL - Processor">
- <_description>Processor</_description>
+ <description>Processor</description>
</object>
<object name="AADL - Memory">
- <_description>Memory</_description>
+ <description>Memory</description>
</object>
<object name="AADL - Bus">
- <_description>Bus</_description>
+ <description>Bus</description>
</object>
<object name="AADL - System">
- <_description>System</_description>
+ <description>System</description>
</object>
<object name="AADL - Subprogram">
- <_description>Subprogram</_description>
+ <description>Subprogram</description>
</object>
<object name="AADL - Thread Group">
- <_description>Thread Group</_description>
+ <description>Thread Group</description>
</object>
<object name="AADL - Device">
- <_description>Device</_description>
+ <description>Device</description>
</object>
<object name="AADL - Package">
- <_description>Package</_description>
+ <description>Package</description>
</object>
</contents>
</sheet>
diff --git a/sheets/Assorted.sheet b/sheets/Assorted.sheet
new file mode 100644
index 00000000..c931bd17
--- /dev/null
+++ b/sheets/Assorted.sheet
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+<!-- Author: Alan Horkan, 2002, mailto:horkana tcd ie -->
+<!-- Please talk to me before making any changes to this sheet -->
+<name>Assorted</name>
+<!-- Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
+Leave as is for now, renaming too much hassle.
+Will probably need to split into seperate sheets soon anyway. -->
+
+<description>An Assorted Collection of Polygons, Beziergons and other Miscellaneous Geometric
Shapes</description>
+<!-- I drew a lot of these shapes based on the Autoshapes from Powerpoint 97.
+Also got some ideas from what the rivals
+http://www.microsoft.com/office/visio/evaluation/indepth/samples.asp -->
+
+<contents>
+
+<!-- All Icons 22x22 pixels. Edited them with the Gimp (and mspaint)
+to get really clean crisp clear looking icons. Icons should probably
+be numbered to make is easier to identify the shapes.
+Vertically or Horizontally Flipped versions of various shapes
+have been included to save users the effort of flipping them
+-->
+
+<!-- Triangles -->
+<object name="Geometric - Right Angle Triangle"><description>Right angle triangle</description></object>
+<object name="Geometric - Isosceles Triangle">
+ <!-- mainatain original typo for compatibility -->
+ <alias name="Geometric - Isoceles Triangle"/>
+ <description>Isosceles triangle</description>
+</object>
+<!-- I am not sure if a Perfect Equilateral Triangle is doable -->
+
+<object name="Geometric - Perfect Square"><description>Perfect square, height equals
width</description></object>
+<object name="Geometric - Perfect Circle"><description>Perfect circle</description></object>
+<object name="Geometric - Quarter Circle"><description>Quarter circle</description></object>
+
+<object name="Geometric - Diamond"><description>Diamond</description></object>
+<!-- Other Polygons -->
+<object name="Geometric - Pentagon"><description>Pentagon. Five-point shape</description></object>
+<object name="Geometric - Hexagon"><description>Hexagon. Six-point shape</description></object>
+<object name="Geometric - Heptagon"><description>Heptagon. Seven-point shape</description></object>
+<object name="Geometric - Octagon"><description>Octagon. Eight-point shape</description></object>
+<!-- Alan Horkan was here 2002 -->
+<object name="Geometric - Horizontal Parallelogram"><description>Horizontal
parallelogram</description></object>
+<object name="Geometric - Vertical Parallelogram"><description>Vertical parallelogram</description></object>
+<object name="Geometric - Trapezoid"><description>Trapezoid</description></object>
+<!-- Description, like a cut off Isoceles Triangle, quadrangle with two parallel sides ... -->
+
+<!-- Stars. Odd numbered sides were particulary hard to draw. -->
+<object name="Geometric - Four Point Star"><description>Four-point star</description></object>
+<object name="Geometric - Curved Four Point Star"><description>Curved four-point star</description></object>
+<object name="Geometric - Five Point Star"><description>Five-point star</description></object>
+<object name="Geometric - Six Point Star"><description>Six-point star</description></object>
+<object name="Geometric - Seven Point Star"><description>Seven-point star</description></object>
+<object name="Geometric - Eight Point Star"><description>Eight-point star</description></object>
+<object name="Geometric - Sharp Eight Point Star"><description>Sharp eight-point star</description></object>
+<object name="Geometric - Curved Eight Point Star"><description>Curved eight-point
star</description></object>
+<!-- TODO: 16 Point Star? 24,32? 9,11,13? -->
+
+<!-- Crosses -->
+<object name="Geometric - Swiss Cross"><description>Swiss cross</description></object>
+<!-- removed temporarily: Geometric - Cross aka cross pattee formee -->
+<object name="Geometric - Maltese Cross"><description>Maltese cross</description></object>
+
+<!-- Block Arrows -->
+<object name="Geometric - Down Arrow"><description>Down arrow</description></object>
+<object name="Geometric - Up Arrow"><description>Up arrow</description></object>
+<object name="Geometric - Left Arrow"><description>Left arrow</description></object>
+<object name="Geometric - Right Arrow"><description>Right arrow</description></object>
+
+<object name="Geometric - Notched Left Arrow"><description>Notched left arrow</description></object>
+<object name="Geometric - Notched Right Arrow"><description>Notched right arrow</description></object>
+
+<object name="Assorted - Left-Up Arrow"><description>Left-up arrow</description></object>
+<object name="Assorted - Turn-Up Arrow"><description>Turn-up arrow</description></object>
+<object name="Geometric - Left-Right Arrow"><description>Left-right arrow</description></object>
+<object name="Geometric - Up-Down Arrow"><description>Up-down arrow</description></object>
+
+<object name="Geometric - Quad Arrow"><description>Quad arrow</description></object><!-- Four -->
+<object name="Geometric - Left-Right-Up Arrow"><description>Left-right-up arrow</description></object><!--
Three -->
+<object name="Geometric - Up-Down-Left Arrow"><description>Up-down-left arrow</description></object><!--
Three -->
+
+<object name="Block Arrow - Pentagon"><description>Pentagon block arrow</description></object>
+<object name="Block Arrow - Chevron"><description>Chevron</description></object>
+
+<!-- Block Arc. removed, needs fixing -->
+<!-- object name="Geometric - Block Arc" description Block Arc /description /object -->
+
+<!-- Heart Shape -->
+<object name="Assorted - Heart"><description>Heart</description></object>
+
+<!-- Sun, Moon. -->
+<object name="Assorted - Sun"><description>Sun</description></object>
+<object name="Assorted - Quarter Moon"><description>Quarter moon</description></object>
+
+<!-- Drop or Droplet Shape -->
+<!-- Flower Shape (with Petals) -->
+<!-- Alien Head shape -->
+
+</contents>
+</sheet>
+<!-- Author: Alan Horkan, 2002, mailto:horkana tcd ie -->
diff --git a/sheets/BPMN.sheet.in b/sheets/BPMN.sheet
similarity index 54%
rename from sheets/BPMN.sheet.in
rename to sheets/BPMN.sheet
index b1267d7f..77e39526 100644
--- a/sheets/BPMN.sheet.in
+++ b/sheets/BPMN.sheet
@@ -4,135 +4,135 @@
<!--File: /home/anthonym/.dia/sheets/BPMN.sheet-->
<!--Date: Tue Apr 13 23:07:18 2004-->
<!--For: anthonym-->
- <_name>BPMN</_name>
- <_description>Business Process Modeling Notation</_description>
+ <name>BPMN</name>
+ <description>Business Process Modeling Notation</description>
<contents>
<!--add shapes here-->
<object name="BPMN - Start-Event">
- <_description>Start Event</_description>
+ <description>Start Event</description>
</object>
<object name="BPMN - Start-Event-Message">
- <_description>Start Event — Message</_description>
+ <description>Start Event — Message</description>
</object>
<object name="BPMN - Start-Event-Timer">
- <_description>Start Event — Timer</_description>
+ <description>Start Event — Timer</description>
</object>
<object name="BPMN - Start-Event-Rule">
- <_description>Start Event — Rule</_description>
+ <description>Start Event — Rule</description>
</object>
<object name="BPMN - Start-Event-Link">
- <_description>Start Event — Link</_description>
+ <description>Start Event — Link</description>
</object>
<object name="BPMN - Start-Event-Multiple">
- <_description>Start Event — Multiple</_description>
+ <description>Start Event — Multiple</description>
</object>
<object name="BPMN - Intermediate-Event">
- <_description>Intermediate Event</_description>
+ <description>Intermediate Event</description>
</object>
<object name="BPMN - Intermediate-Event-Message">
- <_description>Intermediate Event — Message</_description>
+ <description>Intermediate Event — Message</description>
</object>
<object name="BPMN - Intermediate-Event-Timer">
- <_description>Intermediate Event — Timer</_description>
+ <description>Intermediate Event — Timer</description>
</object>
<object name="BPMN - Intermediate-Event-Error">
- <_description>Intermediate Event — Error</_description>
+ <description>Intermediate Event — Error</description>
</object>
<object name="BPMN - Intermediate-Event-Cancel">
- <_description>Intermediate Event — Cancel</_description>
+ <description>Intermediate Event — Cancel</description>
</object>
<object name="BPMN - Intermediate-Event-Compensation">
- <_description>Intermediate Event — Compensation</_description>
+ <description>Intermediate Event — Compensation</description>
</object>
<object name="BPMN - Intermediate-Event-Rule">
- <_description>Intermediate Event — Rule</_description>
+ <description>Intermediate Event — Rule</description>
</object>
<object name="BPMN - Intermediate-Event-Link">
- <_description>Intermediate Event — Link</_description>
+ <description>Intermediate Event — Link</description>
</object>
<object name="BPMN - Intermediate-Event-Multiple">
- <_description>Intermediate Event — Multiple</_description>
+ <description>Intermediate Event — Multiple</description>
</object>
<object name="BPMN - End-Event">
- <_description>End Event</_description>
+ <description>End Event</description>
</object>
<object name="BPMN - End-Event-Message">
- <_description>End Event — Message</_description>
+ <description>End Event — Message</description>
</object>
<object name="BPMN - End-Event-Error">
- <_description>End Event — Error</_description>
+ <description>End Event — Error</description>
</object>
<object name="BPMN - End-Event-Cancel">
- <_description>End Event — Cancel</_description>
+ <description>End Event — Cancel</description>
</object>
<object name="BPMN - End-Event-Compensation">
- <_description>End Event — Compensation</_description>
+ <description>End Event — Compensation</description>
</object>
<object name="BPMN - End-Event-Link">
- <_description>End Event — Link</_description>
+ <description>End Event — Link</description>
</object>
<object name="BPMN - End-Event-Multiple">
- <_description>End Event — Multiple</_description>
+ <description>End Event — Multiple</description>
</object>
<object name="BPMN - End-Event-Terminate">
- <_description>End Event — Terminate</_description>
+ <description>End Event — Terminate</description>
</object>
<object name="BPMN - Gateway">
- <_description>Gateway</_description>
+ <description>Gateway</description>
</object>
<object name="BPMN - Gateway-Exclusive-XOR-Data-Based">
- <_description>Exclusive (XOR) Data Based</_description>
+ <description>Exclusive (XOR) Data Based</description>
</object>
<object name="BPMN - Gateway-Exclusive-XOR-Event-Based">
- <_description>Exclusive (XOR) Event Based</_description>
+ <description>Exclusive (XOR) Event Based</description>
</object>
<object name="BPMN - Gateway-Inclusive-OR">
- <_description>Inclusive (OR)</_description>
+ <description>Inclusive (OR)</description>
</object>
<object name="BPMN - Gateway-Complex">
- <_description>Complex</_description>
+ <description>Complex</description>
</object>
<object name="BPMN - Gateway-Parallel-AND">
- <_description>Parallel (AND)</_description>
+ <description>Parallel (AND)</description>
</object>
<object name="BPMN - Task">
- <_description>Task</_description>
+ <description>Task</description>
</object>
<object name="BPMN - Activity-Looping">
- <_description>Activity Looping</_description>
+ <description>Activity Looping</description>
</object>
<object name="BPMN - Multiple-Instance-Task">
- <_description>Multiple Instance Task</_description>
+ <description>Multiple Instance Task</description>
</object>
<object name="BPMN - Compensation">
- <_description>Compensation Task</_description>
+ <description>Compensation Task</description>
</object>
<object name="BPMN - Collapsed-Sub-Process">
- <_description>Collapsed Sub-Process</_description>
+ <description>Collapsed Sub-Process</description>
</object>
<object name="BPMN - Looping-Collapsed-Sub-Process">
- <_description>Looping Collapsed Sub-Process</_description>
+ <description>Looping Collapsed Sub-Process</description>
</object>
<object name="BPMN - Multiple-Instance-Collapsed-Sub-Process">
- <_description>Multiple Instance Collapsed Sub-Process</_description>
+ <description>Multiple Instance Collapsed Sub-Process</description>
</object>
<object name="BPMN - Ad-Hoc-Collapsed-Sub-Process">
- <_description>Ad-Hoc Collapsed Sub-Process</_description>
+ <description>Ad-Hoc Collapsed Sub-Process</description>
</object>
<object name="BPMN - Compensation-Collapsed-Sub-Process">
- <_description>Compensation Collapsed Sub-Process</_description>
+ <description>Compensation Collapsed Sub-Process</description>
</object>
<object name="BPMN - Group">
- <_description>Group</_description>
+ <description>Group</description>
</object>
<object name="BPMN - Transaction">
- <_description>Transaction</_description>
+ <description>Transaction</description>
</object>
<object name="BPMN - Data-Object">
- <_description>Data Object</_description>
+ <description>Data Object</description>
</object>
<object name="BPMN - Text-Annotation">
- <_description>Text Annotation</_description>
+ <description>Text Annotation</description>
</object>
</contents>
</sheet>
diff --git a/sheets/ChemEng.sheet b/sheets/ChemEng.sheet
new file mode 100644
index 00000000..a2b660e7
--- /dev/null
+++ b/sheets/ChemEng.sheet
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+<!--Dia-Version: 0.91-->
+<!--File: /home/zenith/.dia/sheets/Chemeng.sheet-->
+<!--Date: Wed Jun 25 14:15:42 2003-->
+<!--For: zenith-->
+
+<name>ChemEng</name>
+<description>Collection for chemical engineering</description>
+<contents>
+<!--add shapes here-->
+<object name="chemeng - fan">
+<description>Fan or Stirrer</description></object><object name="chemeng - spray">
+<description>Spraying Device</description></object><object name="chemeng - pneum">
+<description>Pneumatic Line</description></object><object name="chemeng - pneumv">
+<description>Pneumatic Line, vertical</description></object><object name="chemeng - measure">
+<description>Measurement</description></object><object name="chemeng - hx">
+<description>Simple Heat Exchanger</description></object><object name="chemeng - hxv">
+<description>Simple Heat Exchanger, vertical</description></object><object name="chemeng - wcool">
+<description>Water Cooler</description></object><object name="chemeng - wcoolv">
+<description>Water Cooler, vertical</description></object><object name="chemeng - SaT-fixedtube">
+<description>Fixed-Sheet Exchanger</description></object><object name="chemeng - SaT-floatinghead">
+<description>Floating-Head or U-Tube Exchanger</description></object><object name="chemeng - kettle">
+<description>Kettle Reboiler</description></object><object name="chemeng - aircooler">
+<description>Air Cooler</description></object><object name="chemeng - airforced">
+<description>Forced-Flow Air Cooler</description></object><object name="chemeng - airinduced">
+<description>Induced-Flow Air Cooler</description></object><object name="chemeng - plate">
+<description>Plate Exchanger</description></object><object name="chemeng - doublepipe">
+<description>Double-Pipe Exchanger</description></object><object name="chemeng - coil">
+<description>Heating/Cooling Coil</description></object><object name="chemeng - coilv">
+<description>Heating/Cooling Coil, vertical</description></object><object name="chemeng - furnace">
+<description>Simple Furnace</description></object><object name="chemeng - vessel">
+<description>Simple Vessel</description></object><object name="chemeng - knockout">
+<description>Knock-out Drum (with demister pad)</description></object><object name="chemeng - traycol">
+<description>Tray Column, simple</description></object><object name="chemeng - bigtraycol">
+<description>Tray Column, detailed</description></object><object name="chemeng - fluidcont">
+<description>Fluid Contacting Vessel, simple</description></object><object name="chemeng - reactor">
+<description>Reactor or Absorption Vessel, simple</description></object><object name="chemengtmp -
autoclave">
+<description>Autoclave</description></object><object name="chemengtmp - tank">
+<description>Open Tank</description></object><object name="chemengtmp - settling">
+<description>Clarifier or Settling Tank</description></object><object name="chemengtmp - sealedtank">
+<description>Sealed Tank</description></object><object name="chemengtmp - coveredtank">
+<description>Covered tank</description></object><object name="chemengtmp - fixedroof">
+<description>Tank with Fixed Roof</description></object><object name="chemengtmp - floatingroof">
+<description>Tank with Floating Roof</description></object><object name="chemengtmp - storagesphere">
+<description>Storage Sphere</description></object><object name="chemengtmp - gasholder">
+<description>Gas Holder, basic</description></object><object name="chemeng - pump">
+<description>Centrifugal Pump or Fan</description></object><object name="chemeng - displa">
+<description>Positive Displacement Rotary Pump or Compressor</description></object><object name="chemeng -
recipr">
+<description>Reciprocating Compressor or Pump</description></object><object name="chemeng - flowfan">
+<description>Axial Flow Fan</description></object><object name="chemeng - compr">
+<description>Compressor or Turbine</description></object><object name="chemeng - ejector">
+<description>Ejector or Injector</description></object><object name="chemeng - ACgen">
+<description>AC Generator</description></object><object name="chemeng - val">
+<description>Valve</description></object><object name="chemeng - valv">
+<description>Valve, vertical</description></object><object name="chemeng - regval">
+<description>Regulable Valve</description></object><object name="chemeng - regvalv">
+<description>Regulable Valve, vertical</description></object><object name="chemengtmp - filter">
+<description>Basic Filter</description></object><object name="chemengtmp - mixer">
+<description>Mixer</description></object><object name="chemengtmp - cyclone">
+<description>Cyclone and hydrocyclone</description></object><object name="chemengtmp - spraydrier">
+<description>Spray Drier</description></object><object name="chemengtmp - centrifuge">
+<description>Centrifuge</description></object>
+<object name="chemeng - prv"><description>Pressure Relief Valve</description></object></contents></sheet>
diff --git a/sheets/Circuit.sheet.in b/sheets/Circuit.sheet
similarity index 54%
rename from sheets/Circuit.sheet.in
rename to sheets/Circuit.sheet
index c6c4fe90..cf270d74 100644
--- a/sheets/Circuit.sheet.in
+++ b/sheets/Circuit.sheet
@@ -1,114 +1,114 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Circuit</_name>
- <_description>Components for circuit diagrams</_description>
+ <name>Circuit</name>
+ <description>Components for circuit diagrams</description>
<contents>
<object name="Circuit - Vertical Resistor">
- <_description>Vertically aligned resistor</_description>
+ <description>Vertically aligned resistor</description>
</object>
<object name="Circuit - Horizontal Inductor">
- <_description>Horizontally aligned inductor</_description>
+ <description>Horizontally aligned inductor</description>
</object>
<object name="Circuit - Vertical Inductor">
- <_description>Vertically aligned inductor</_description>
+ <description>Vertically aligned inductor</description>
</object>
<object name="Circuit - Horizontal Resistor">
- <_description>Horizontally aligned resistor</_description>
+ <description>Horizontally aligned resistor</description>
</object>
<br/>
<object name="Circuit - Vertical Resistor (European)">
- <_description>Vertically aligned resistor (European)</_description>
+ <description>Vertically aligned resistor (European)</description>
</object>
<object name="Circuit - Horizontal Inductor (European)">
- <_description>Horizontally aligned inductor (European)</_description>
+ <description>Horizontally aligned inductor (European)</description>
</object>
<object name="Circuit - Vertical Inductor (European)">
- <_description>Vertically aligned inductor (European)</_description>
+ <description>Vertically aligned inductor (European)</description>
</object>
<object name="Circuit - Horizontal Resistor (European)">
- <_description>Horizontally aligned resistor (European)</_description>
+ <description>Horizontally aligned resistor (European)</description>
</object>
<br/>
<object name="Circuit - Horizontal Capacitor">
- <_description>Horizontally aligned capacitor</_description>
+ <description>Horizontally aligned capacitor</description>
</object>
<object name="Circuit - Vertical Capacitor">
- <_description>Vertically aligned capacitor</_description>
+ <description>Vertically aligned capacitor</description>
</object>
<br/>
<object name="Circuit - NPN Transistor">
<!--
-->
- <_description>NPN bipolar transistor</_description>
+ <description>NPN bipolar transistor</description>
</object>
<object name="Circuit - PNP Transistor">
<!--
-->
- <_description>PNP bipolar transistor</_description>
+ <description>PNP bipolar transistor</description>
</object>
<br/>
<object name="Circuit - Horizontal Diode">
- <_description>Horizontally aligned diode</_description>
+ <description>Horizontally aligned diode</description>
</object>
<object name="Circuit - Vertical Diode">
- <_description>Vertically aligned diode</_description>
+ <description>Vertically aligned diode</description>
</object>
<object name="Circuit - Horizontal Zener Diode">
- <_description>Horizontally aligned zener diode</_description>
+ <description>Horizontally aligned zener diode</description>
</object>
<object name="Circuit - Vertical Zener Diode">
- <_description>Vertically aligned zener diode</_description>
+ <description>Vertically aligned zener diode</description>
</object>
<br/>
<object name="Circuit - Ground">
- <_description>Ground point</_description>
+ <description>Ground point</description>
</object>
<object name="Circuit - Op Amp">
- <_description>Operational amplifier</_description>
+ <description>Operational amplifier</description>
</object>
<object name="Circuit - Horizontal Fuse (European)">
- <_description>Horizontally aligned fuse</_description>
+ <description>Horizontally aligned fuse</description>
</object>
<object name="Circuit - Vertical Fuse (European)">
- <_description>Vertically aligned fuse</_description>
+ <description>Vertically aligned fuse</description>
</object>
<object name="Circuit - Horizontal Powersource (European)">
- <_description>Horizontally aligned power source</_description>
+ <description>Horizontally aligned power source</description>
</object>
<object name="Circuit - Vertical Powersource (European)">
- <_description>Vertically aligned power source</_description>
+ <description>Vertically aligned power source</description>
</object>
<object name="Circuit - Lamp (European)">
- <_description>Lamp</_description>
+ <description>Lamp</description>
</object>
<object name="Circuit - Speaker (European)">
- <_description>Speaker</_description>
+ <description>Speaker</description>
</object>
<object name="Circuit - Microphone (European)">
- <_description>Microphone</_description>
+ <description>Microphone</description>
</object>
<br/>
<object name="Circuit - Horizontal Led (European)">
- <_description>Horizontally aligned LED</_description>
+ <description>Horizontally aligned LED</description>
</object>
<object name="Circuit - Vertical Led (European)">
- <_description>Vertically aligned LED</_description>
+ <description>Vertically aligned LED</description>
</object>
<br/>
<object name="Circuit - NMOS Transistor (European)">
- <_description>NMOS transistor</_description>
+ <description>NMOS transistor</description>
</object>
<object name="Circuit - PMOS Transistor (European)">
- <_description>PMOS transistor</_description>
+ <description>PMOS transistor</description>
</object>
<object name="Circuit - Horizontal Jumper">
- <_description>Horizontal jumper</_description>
+ <description>Horizontal jumper</description>
</object>
<object name="Circuit - Horizontal Xtal">
- <_description>Horizontal xtal</_description>
+ <description>Horizontal xtal</description>
</object>
<object name="Circuit - Vertical Xtal">
- <_description>Vertical xtal</_description>
+ <description>Vertical xtal</description>
</object>
</contents>
</sheet>
diff --git a/sheets/Contact.sheet.in b/sheets/Contact.sheet
similarity index 50%
rename from sheets/Contact.sheet.in
rename to sheets/Contact.sheet
index 7907d8f0..a51f36a8 100644
--- a/sheets/Contact.sheet.in
+++ b/sheets/Contact.sheet
@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Ladder</_name>
- <_description>Components for LADDER circuits</_description>
+ <name>Ladder</name>
+ <description>Components for LADDER circuits</description>
<contents>
<object name="LADDER - if">
- <_description>'if' (normally open) ladder contact</_description>
+ <description>'if' (normally open) ladder contact</description>
</object>
<object name="LADDER - ifnot">
- <_description>'if not' (normally closed) ladder contact</_description>
+ <description>'if not' (normally closed) ladder contact</description>
</object>
<br/>
<object name="LADDER - out">
- <_description>Simple output variable</_description>
+ <description>Simple output variable</description>
</object>
<object name="LADDER - outnot">
- <_description>Negative output variable</_description>
+ <description>Negative output variable</description>
</object>
<object name="LADDER - outs">
- <_description>'set' output variable</_description>
+ <description>'set' output variable</description>
</object>
<object name="LADDER - outr">
- <_description>'reset' output variable</_description>
+ <description>'reset' output variable</description>
</object>
<object name="LADDER - outj">
- <_description>'jump' output variable</_description>
+ <description>'jump' output variable</description>
</object>
<object name="LADDER - outrcep">
- <_description>Receptivity output variable</_description>
+ <description>Receptivity output variable</description>
</object>
<br/>
<object name="LADDER - sout">
- <_description>Power-saved simple output variable</_description>
+ <description>Power-saved simple output variable</description>
</object>
<object name="LADDER - soutnot">
- <_description>Power-saved negative output variable</_description>
+ <description>Power-saved negative output variable</description>
</object>
<object name="LADDER - souts">
- <_description>Power-saved 'set' output variable</_description>
+ <description>Power-saved 'set' output variable</description>
</object>
<object name="LADDER - soutr">
- <_description>Power-saved 'reset' output variable</_description>
+ <description>Power-saved 'reset' output variable</description>
</object>
<!-- TODO : OPERATE, COMPARE, PULSE, TXT, TIMER and various sizes of
general-purpose blocks
diff --git a/sheets/Cybernetics.sheet.in b/sheets/Cybernetics.sheet
similarity index 51%
rename from sheets/Cybernetics.sheet.in
rename to sheets/Cybernetics.sheet
index a94e2664..dedb44ed 100644
--- a/sheets/Cybernetics.sheet.in
+++ b/sheets/Cybernetics.sheet
@@ -1,122 +1,122 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Cybernetics</_name>
- <_description>Elements of cybernetic circuits</_description>
+ <name>Cybernetics</name>
+ <description>Elements of cybernetic circuits</description>
<contents>
<object name="Cybernetics - l-sens">
- <_description>Sensor — left</_description>
+ <description>Sensor — left</description>
</object>
<object name="Cybernetics - r-sens">
- <_description>Sensor — right</_description>
+ <description>Sensor — right</description>
</object>
<object name="Cybernetics - b-sens">
- <_description>Sensor — bottom</_description>
+ <description>Sensor — bottom</description>
</object>
<object name="Cybernetics - t-sens">
- <_description>Sensor — top</_description>
+ <description>Sensor — top</description>
</object>
<br/>
<object name="Cybernetics - l-minus">
- <_description>Sum, subtracting left input</_description>
+ <description>Sum, subtracting left input</description>
</object>
<object name="Cybernetics - r-minus">
- <_description>Sum, subtracting right input</_description>
+ <description>Sum, subtracting right input</description>
</object>
<object name="Cybernetics - b-minus">
- <_description>Sum, subtracting bottom input</_description>
+ <description>Sum, subtracting bottom input</description>
</object>
<object name="Cybernetics - t-minus">
- <_description>Sum, subtracting top input</_description>
+ <description>Sum, subtracting top input</description>
</object>
<br/>
<object name="Cybernetics - l-integrator">
- <_description>Integrator — input left</_description>
+ <description>Integrator — input left</description>
</object>
<object name="Cybernetics - r-integrator">
- <_description>Integrator — input right</_description>
+ <description>Integrator — input right</description>
</object>
<object name="Cybernetics - b-integrator">
- <_description>Integrator — input bottom</_description>
+ <description>Integrator — input bottom</description>
</object>
<object name="Cybernetics - t-integrator">
- <_description>Integrator — input top</_description>
+ <description>Integrator — input top</description>
</object>
<br/>
<object name="Cybernetics - sum">
- <_description>Sum</_description>
+ <description>Sum</description>
</object>
<object name="Cybernetics - product">
- <_description>Product</_description>
+ <description>Product</description>
</object>
<object name="Cybernetics - hpf">
- <_description>High pass filter</_description>
+ <description>High pass filter</description>
</object>
<object name="Cybernetics - lpf">
- <_description>Low pass filter</_description>
+ <description>Low pass filter</description>
</object>
<br/>
<object name="Cybernetics - sine">
- <_description>Sine characteristic or input</_description>
+ <description>Sine characteristic or input</description>
</object>
<object name="Cybernetics - sigmoid">
- <_description>Sigmoid characteristic</_description>
+ <description>Sigmoid characteristic</description>
</object>
<object name="Cybernetics - saturation">
- <_description>Saturation characteristic</_description>
+ <description>Saturation characteristic</description>
</object>
<object name="Cybernetics - relay">
- <_description>Relay characteristic (sigma)</_description>
+ <description>Relay characteristic (sigma)</description>
</object>
<br/>
<object name="Cybernetics - half-wave-rectifier">
- <_description>Half wave rectifier or ramp input</_description>
+ <description>Half wave rectifier or ramp input</description>
</object>
<object name="Cybernetics - full-wave-rectifier">
- <_description>Full wave rectifier (absolute value)</_description>
+ <description>Full wave rectifier (absolute value)</description>
</object>
<object name="Cybernetics - positive-shift">
- <_description>Constant positive shift on the y-axis</_description>
+ <description>Constant positive shift on the y-axis</description>
</object>
<object name="Cybernetics - negative-shift">
- <_description>Constant negative shift on the y-axis</_description>
+ <description>Constant negative shift on the y-axis</description>
</object>
<br/>
<object name="Cybernetics - factor-greater1">
- <_description>Constant factor greater 1</_description>
+ <description>Constant factor greater 1</description>
</object>
<object name="Cybernetics - factor-0to1">
- <_description>Constant factor between 0 and 1</_description>
+ <description>Constant factor between 0 and 1</description>
</object>
<object name="Cybernetics - factor-0to-1">
- <_description>Constant factor between 0 and -1</_description>
+ <description>Constant factor between 0 and -1</description>
</object>
<object name="Cybernetics - factor-smaller-1">
- <_description>Constant factor below -1</_description>
+ <description>Constant factor below -1</description>
</object>
<br/>
<object name="Cybernetics - empty-func">
- <_description>Template for custom characteristics</_description>
+ <description>Template for custom characteristics</description>
</object>
<object name="Cybernetics - delta-t">
- <_description>Time delay</_description>
+ <description>Time delay</description>
</object>
</contents>
diff --git a/sheets/Database.sheet.in b/sheets/Database.sheet
similarity index 57%
rename from sheets/Database.sheet.in
rename to sheets/Database.sheet
index 5115f0ff..1f59778f 100644
--- a/sheets/Database.sheet.in
+++ b/sheets/Database.sheet
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Database</_name>
- <_description>Editor for Database Table Relation Diagrams</_description>
+ <name>Database</name>
+ <description>Editor for Database Table Relation Diagrams</description>
<contents>
<object name="Database - Table">
- <_description>Table</_description>
+ <description>Table</description>
</object>
<object name="Database - Reference">
- <_description>Reference</_description>
+ <description>Reference</description>
</object>
<object name="Database - Compound">
- <_description>Attribute compound</_description>
+ <description>Attribute compound</description>
</object>
</contents>
</sheet>
diff --git a/sheets/ER.sheet.in b/sheets/ER.sheet
similarity index 60%
rename from sheets/ER.sheet.in
rename to sheets/ER.sheet
index 661c60ab..58610a61 100644
--- a/sheets/ER.sheet.in
+++ b/sheets/ER.sheet
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>ER</_name>
- <_description>Editor for Entity Relations Diagrams</_description>
+ <name>ER</name>
+ <description>Editor for Entity Relations Diagrams</description>
<contents>
<object name="ER - Entity" intdata="0">
- <_description>Entity</_description>
+ <description>Entity</description>
</object>
<object name="ER - Entity" intdata="1">
- <_description>Weak entity</_description>
+ <description>Weak entity</description>
<icon>res:/org/gnome/Dia/ER/weakentity.png</icon>
</object>
<object name="ER - Relationship">
- <_description>Relationship</_description>
+ <description>Relationship</description>
</object>
<object name="ER - Attribute">
- <_description>Attribute</_description>
+ <description>Attribute</description>
</object>
<object name="ER - Participation">
- <_description>Participation</_description>
+ <description>Participation</description>
</object>
</contents>
</sheet>
diff --git a/sheets/Electric.sheet.in b/sheets/Electric.sheet
similarity index 52%
rename from sheets/Electric.sheet.in
rename to sheets/Electric.sheet
index 252f67cf..fd408553 100644
--- a/sheets/Electric.sheet.in
+++ b/sheets/Electric.sheet
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Electric</_name>
- <_description>Components for electric circuits</_description>
+ <name>Electric</name>
+ <description>Components for electric circuits</description>
<contents>
<object name="Electric - contact_o">
- <_description>Normally open contact (horizontal)</_description>
+ <description>Normally open contact (horizontal)</description>
</object>
<object name="Electric - contact_f">
- <_description>Normally closed contact (horizontal)</_description>
+ <description>Normally closed contact (horizontal)</description>
</object>
<object name="Electric - intpos_o">
- <_description>Normally open position switch (horizontal)</_description>
+ <description>Normally open position switch (horizontal)</description>
</object>
<object name="Electric - intpos_f">
- <_description>Normally closed position switch (horizontal)</_description>
+ <description>Normally closed position switch (horizontal)</description>
</object>
<br/>
<object name="Electric - vcontact_o">
- <_description>Normally open contact (vertical)</_description>
+ <description>Normally open contact (vertical)</description>
</object>
<object name="Electric - vcontact_f">
- <_description>Normally closed contact (vertical)</_description>
+ <description>Normally closed contact (vertical)</description>
</object>
<object name="Electric - vintpos_o">
- <_description>Normally open position switch (vertical)</_description>
+ <description>Normally open position switch (vertical)</description>
</object>
<object name="Electric - vintpos_f">
- <_description>Normally closed position switch (vertical)</_description>
+ <description>Normally closed position switch (vertical)</description>
</object>
<br/>
<object name="Electric - command">
- <_description>The command organ of a relay (horizontal)</_description>
+ <description>The command organ of a relay (horizontal)</description>
</object>
<object name="Electric - relay">
- <_description>Relay (horizontal)</_description>
+ <description>Relay (horizontal)</description>
</object>
<object name="Electric - lamp">
- <_description>Lamp or indicator light (horizontal)</_description>
+ <description>Lamp or indicator light (horizontal)</description>
</object>
<br/>
<object name="Electric - vcommand">
- <_description>The command organ of a relay (vertical)</_description>
+ <description>The command organ of a relay (vertical)</description>
</object>
<object name="Electric - vrelay">
- <_description>Relay (vertical)</_description>
+ <description>Relay (vertical)</description>
</object>
<object name="Electric - vlamp">
- <_description>Lamp or indicator light (vertical)</_description>
+ <description>Lamp or indicator light (vertical)</description>
</object>
<br/>
<object name="Electric - connpoint">
- <_description>Connection point</_description>
+ <description>Connection point</description>
</object>
<!-- TODO: various detectors (proximity, light, heat), motors, starters,
... Maybe also a nice type of line with automatic (printed) connection
diff --git a/sheets/FS.sheet.in b/sheets/FS.sheet
similarity index 56%
rename from sheets/FS.sheet.in
rename to sheets/FS.sheet
index e54cc92d..3c590b8c 100644
--- a/sheets/FS.sheet.in
+++ b/sheets/FS.sheet
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>FS</_name>
- <_description>Editor for Function Structure Diagrams.</_description>
+ <name>FS</name>
+ <description>Editor for Function Structure Diagrams.</description>
<contents>
<object name="FS - Flow">
- <_description>Flow</_description>
+ <description>Flow</description>
</object>
<object name="FS - Orthflow">
- <_description>Orthogonal polyline flow</_description>
+ <description>Orthogonal polyline flow</description>
</object>
<object name="FS - Function">
- <_description>Function</_description>
+ <description>Function</description>
</object>
</contents>
</sheet>
diff --git a/sheets/Flowchart.sheet.in b/sheets/Flowchart.sheet
similarity index 56%
rename from sheets/Flowchart.sheet.in
rename to sheets/Flowchart.sheet
index 779d7b7c..9f4e21f3 100644
--- a/sheets/Flowchart.sheet.in
+++ b/sheets/Flowchart.sheet
@@ -1,97 +1,97 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Flowchart</_name>
- <_description>Objects to draw flowcharts</_description>
+ <name>Flowchart</name>
+ <description>Objects to draw flowcharts</description>
<contents>
<object name="Flowchart - Box">
- <_description>Process/Auxiliary Operation</_description>
+ <description>Process/Auxiliary Operation</description>
</object>
<object name="Flowchart - Parallelogram">
- <_description>Input/Output</_description>
+ <description>Input/Output</description>
</object>
<object name="Flowchart - Diamond">
- <_description>Decision</_description>
+ <description>Decision</description>
</object>
<object name="Flowchart - Ellipse">
- <_description>Connector</_description>
+ <description>Connector</description>
</object>
<object name="Flowchart - Display">
- <_description>Display</_description>
+ <description>Display</description>
</object>
<object name="Flowchart - Transaction File">
- <_description>Transaction file</_description>
+ <description>Transaction file</description>
</object>
<object name="Flowchart - Off Page Connector">
<!-- XXX -->
- <_description>Off page connector</_description>
+ <description>Off page connector</description>
</object>
<object name="Flowchart - Document">
- <_description>Document</_description>
+ <description>Document</description>
</object>
<object name="Flowchart - Manual Operation">
- <_description>Manual operation</_description>
+ <description>Manual operation</description>
</object>
<object name="Flowchart - Preparation">
- <_description>Preparation</_description>
+ <description>Preparation</description>
</object>
<object name="Flowchart - Manual Input">
- <_description>Manual input</_description>
+ <description>Manual input</description>
</object>
<object name="Flowchart - Predefined Process">
- <_description>Predefined process</_description>
+ <description>Predefined process</description>
</object>
<object name="Flowchart - Terminal">
- <_description>Terminal Interrupt</_description>
+ <description>Terminal Interrupt</description>
</object>
<object name="Flowchart - Magnetic Disk">
- <_description>Magnetic disk</_description>
+ <description>Magnetic disk</description>
</object>
<object name="Flowchart - Magnetic Drum">
- <_description>Magnetic drum</_description>
+ <description>Magnetic drum</description>
</object>
<object name="Flowchart - Magnetic Tape">
- <_description>Magnetic tape</_description>
+ <description>Magnetic tape</description>
</object>
<object name="Flowchart - Internal Storage">
- <_description>Internal storage</_description>
+ <description>Internal storage</description>
</object>
<object name="Flowchart - Merge">
- <_description>Merge</_description>
+ <description>Merge</description>
</object>
<object name="Flowchart - Extract">
- <_description>Extract</_description>
+ <description>Extract</description>
</object>
<object name="Flowchart - Delay">
- <_description>Delay</_description>
+ <description>Delay</description>
</object>
<object name="Flowchart - Summing Junction">
<!-- XXX -->
- <_description>Summing junction</_description>
+ <description>Summing junction</description>
</object>
<object name="Flowchart - Collate">
<!-- XXX -->
- <_description>Collate</_description>
+ <description>Collate</description>
</object>
<object name="Flowchart - Sort">
- <_description>Sort</_description>
+ <description>Sort</description>
</object>
<object name="Flowchart - Or">
- <_description>Or</_description>
+ <description>Or</description>
</object>
<object name="Flowchart - Punched Card">
- <_description>Punched card</_description>
+ <description>Punched card</description>
</object>
<object name="Flowchart - Punched Tape">
- <_description>Punched tape</_description>
+ <description>Punched tape</description>
</object>
<object name="Flowchart - Transmittal Tape">
- <_description>Transmittal tape</_description>
+ <description>Transmittal tape</description>
</object>
<object name="Flowchart - Offline Storage">
- <_description>Offline storage</_description>
+ <description>Offline storage</description>
</object>
<object name="Flowchart - Data Source">
- <_description>Data source</_description>
+ <description>Data source</description>
</object>
</contents>
</sheet>
diff --git a/sheets/GRAFCET.sheet.in b/sheets/GRAFCET.sheet
similarity index 63%
rename from sheets/GRAFCET.sheet.in
rename to sheets/GRAFCET.sheet
index 1ff687ab..367872b5 100644
--- a/sheets/GRAFCET.sheet.in
+++ b/sheets/GRAFCET.sheet
@@ -1,52 +1,52 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>GRAFCET</_name>
- <_description>Objects to design GRAFCET charts</_description>
+ <name>GRAFCET</name>
+ <description>Objects to design GRAFCET charts</description>
<contents>
<object name="GRAFCET - Step" intdata="0">
- <_description>Regular step</_description>
+ <description>Regular step</description>
</object>
<object name="GRAFCET - Step" intdata="1">
- <_description>Initial step</_description>
+ <description>Initial step</description>
<icon>res:/org/gnome/Dia/GRAFCET/etapei.png</icon>
</object>
<object name="GRAFCET - Step" intdata="2">
- <_description>Macro entry step</_description>
+ <description>Macro entry step</description>
<icon>res:/org/gnome/Dia/GRAFCET/etapeme.png</icon>
</object>
<object name="GRAFCET - Step" intdata="3">
- <_description>Macro exit step</_description>
+ <description>Macro exit step</description>
<icon>res:/org/gnome/Dia/GRAFCET/etapems.png</icon>
</object>
<object name="GRAFCET - Step" intdata="4">
- <_description>Macro call step</_description>
+ <description>Macro call step</description>
<icon>res:/org/gnome/Dia/GRAFCET/etapemc.png</icon>
</object>
<object name="GRAFCET - Step" intdata="5">
- <_description>Macro sub-program call step</_description>
+ <description>Macro sub-program call step</description>
<icon>res:/org/gnome/Dia/GRAFCET/etapesp.png</icon>
</object>
<br/>
<object name="GRAFCET - Action">
- <_description>Action to associate to a step</_description>
+ <description>Action to associate to a step</description>
</object>
<object name="GRAFCET - Condition">
- <_description>Condition (of an action)</_description>
+ <description>Condition (of an action)</description>
</object>
<br/>
<object name="GRAFCET - Transition">
- <_description>Transition</_description>
+ <description>Transition</description>
</object>
<object name="GRAFCET - Vergent" intdata="0">
- <_description>OR vergent</_description>
+ <description>OR vergent</description>
</object>
<object name="GRAFCET - Vergent" intdata="1">
- <_description>AND vergent</_description>
+ <description>AND vergent</description>
<icon>res:/org/gnome/Dia/GRAFCET/vergent_and.png</icon>
</object>
<br/>
<object name="GRAFCET - Arc">
- <_description>Arc (upward)</_description>
+ <description>Arc (upward)</description>
</object>
</contents>
</sheet>
diff --git a/sheets/Gane_and_Sarson.sheet.in b/sheets/Gane_and_Sarson.sheet
similarity index 66%
rename from sheets/Gane_and_Sarson.sheet.in
rename to sheets/Gane_and_Sarson.sheet
index 5c747fd8..8e998b49 100644
--- a/sheets/Gane_and_Sarson.sheet.in
+++ b/sheets/Gane_and_Sarson.sheet
@@ -4,21 +4,21 @@
<!--Date: Sun Oct 23 17:12:11 2005-->
<!--Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com -->
-<_name>Gane and Sarson</_name>
-<_description>Gane and Sarson DFD</_description>
+<name>Gane and Sarson</name>
+<description>Gane and Sarson DFD</description>
<contents>
<!--add shapes here-->
<object name="G&S - Alternative External Entity">
-<_description>Alternate external entity</_description>
+<description>Alternate external entity</description>
</object>
<object name="G&S - Data Store">
-<_description>Data store</_description>
+<description>Data store</description>
</object>
<object name="G&S - External Entity">
-<_description>External entity</_description>
+<description>External entity</description>
</object>
<object name="G&S - Process">
-<_description>Process</_description>
+<description>Process</description>
</object>
</contents>
</sheet>
diff --git a/sheets/IsometricMap.sheet b/sheets/IsometricMap.sheet
new file mode 100644
index 00000000..9522c2d8
--- /dev/null
+++ b/sheets/IsometricMap.sheet
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns"; xmlns:dc="http://purl.org/dc/elements/1.1";>
+
+<!-- Dia-Version: 0.90-->
+<dc:creator>Alan Horkan</dc:creator>
+<dc:rights>Copyright Alan Horkan 2003</dc:rights>
+
+<!-- use dc:title instead? -->
+ <name>Map, Isometric</name>
+ <!-- Visio calls theses Map, Directional Map 3D. -->
+ <!-- use dc:description instead? -->
+ <description>Isometric Directional Map Shapes</description><!-- Pseudo Three Dimensional -->
+
+<contents>
+<!--add shapes here-->
+<object name="Road1"><description>Road Section</description></object>
+<object name="StraightRoad1"><description>Long Straight Road Section</description></object>
+
+<object name="Crossroads"><description>Crossroads</description></object>
+
+<object name="T-Junction"><description>T-Junction</description></object>
+<!-- also known as an Intersection -->
+
+<object name="Elevated"><description>Elevated Road</description></object>
+
+<object name="Corner1"><description>Corner 1</description></object>
+<object name="Corner2"><description>Corner 2</description></object>
+
+<object name="River"><description>River</description></object>
+
+<object name="Roof1"><description>Roof 1</description></object>
+<object name="Block1"><description>Block 1, 2:4</description></object>
+<object name="Block2"><description>Block 2, 2:8</description></object>
+<object name="Block3"><description>Block 3, 4:4</description></object>
+<object name="Block4"><description>Block 4, 4:8</description></object>
+<object name="Block5"><description>Block 5, 3:3</description></object>
+<object name="Block6"><description>Block 6, 4:6</description></object>
+
+<!-- A Building, not really a block but Visio called it Block 7.
+Need to think of a better name. -->
+<object name="Block7"><description>Block 7</description></object>
+
+<object name="Factory"><description>Factory</description></object>
+
+<!-- Cars and Vehicles -->
+<object name="Car1"><description>Car 1, Front View</description></object>
+<object name="Car2"><description>Car 2, Rear View</description></object>
+
+
+<!-- Deprecated
+object name="RedCar" description Red Car
+-->
+<!-- RedCar, colour hardcoded.
+Car 1 can be changed to whatever colour the user wants,
+but by using the foreground+background variables I cannot
+set the default colours. bug ###### ? -->
+
+<object name="Train1"><description>Train 1, angled downward</description></object>
+<object name="Train2"><description>Train 2, angled upward</description></object>
+
+<!-- Trees & Scenery -->
+<object name="Tree1"><description>Tree 1</description></object>
+
+<object name="FootBridge"><description>Footbridge, Pedestrian Bridge</description></object>
+<object name="OneWay"><description>One Way Road Sign</description></object>
+
+
+</contents>
+
+</sheet>
diff --git a/sheets/Istar.sheet.in b/sheets/Istar.sheet
similarity index 65%
rename from sheets/Istar.sheet.in
rename to sheets/Istar.sheet
index 9634d7f4..79ac0bfe 100644
--- a/sheets/Istar.sheet.in
+++ b/sheets/Istar.sheet
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>RE-i*</_name>
- <_description>Objects to design i* diagrams</_description>
+ <name>RE-i*</name>
+ <description>Objects to design i* diagrams</description>
<contents>
<object name="Istar - goal" intdata="1">
- <_description>An i* softgoal</_description>
+ <description>An i* softgoal</description>
</object>
<object name="Istar - goal" intdata="2">
- <_description>An i* goal</_description>
+ <description>An i* goal</description>
<icon>res:/org/gnome/Dia/Istar/goal.png</icon>
</object>
<object name="Istar - other" intdata="1">
- <_description>An i* resource</_description>
+ <description>An i* resource</description>
</object>
<object name="Istar - other" intdata="2">
- <_description>An i* task</_description>
+ <description>An i* task</description>
<icon>res:/org/gnome/Dia/Istar/task.png</icon>
</object>
<object name="Istar - actor" intdata="1">
- <_description>An i* unspecified actor</_description>
+ <description>An i* unspecified actor</description>
</object>
<object name="Istar - actor" intdata="2">
- <_description>An i* agent</_description>
+ <description>An i* agent</description>
<icon>res:/org/gnome/Dia/Istar/agent.png</icon>
</object>
<object name="Istar - actor" intdata="3">
- <_description>An i* position</_description>
+ <description>An i* position</description>
<icon>res:/org/gnome/Dia/Istar/position.png</icon>
</object>
<object name="Istar - actor" intdata="4">
- <_description>An i* role</_description>
+ <description>An i* role</description>
<icon>res:/org/gnome/Dia/Istar/role.png</icon>
</object>
<object name="Istar - link" intdata="1">
- <_description>An i* unspecified link</_description>
+ <description>An i* unspecified link</description>
</object>
<object name="Istar - link" intdata="2">
- <_description>An i* positive contribution</_description>
+ <description>An i* positive contribution</description>
<icon>res:/org/gnome/Dia/Istar/pos_contrib.png</icon>
</object>
<object name="Istar - link" intdata="3">
- <_description>An i* negative contribution</_description>
+ <description>An i* negative contribution</description>
<icon>res:/org/gnome/Dia/Istar/neg_contrib.png</icon>
</object>
<object name="Istar - link" intdata="4">
- <_description>An i* dependency link</_description>
+ <description>An i* dependency link</description>
<icon>res:/org/gnome/Dia/Istar/dependency.png</icon>
</object>
<object name="Istar - link" intdata="5">
- <_description>An i* decomposition link</_description>
+ <description>An i* decomposition link</description>
<icon>res:/org/gnome/Dia/Istar/decomposition.png</icon>
</object>
<object name="Istar - link" intdata="6">
- <_description>An i* means-ends link</_description>
+ <description>An i* means-ends link</description>
<icon>res:/org/gnome/Dia/Istar/means_ends.png</icon>
</object>
</contents>
diff --git a/sheets/Jackson.sheet b/sheets/Jackson.sheet
new file mode 100644
index 00000000..0ed2d684
--- /dev/null
+++ b/sheets/Jackson.sheet
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+ <name>RE-Jackson</name>
+ <description>Objects to design Jackson diagrams</description>
+ <contents>
+ <object name="Jackson - domain" intdata="1">
+ <description>A Jackson given domain</description>
+ </object>
+ <object name="Jackson - domain" intdata="2">
+ <description>A Jackson designed domain</description>
+ <icon>res:/org/gnome/Dia/Jackson/designeddomain.png</icon>
+ </object>
+ <object name="Jackson - domain" intdata="3">
+ <description>A Jackson machine domain</description>
+ <icon>res:/org/gnome/Dia/Jackson/machinedomain.png</icon>
+ </object>
+ <object name="Jackson - requirement" intdata="1">
+ <description>A Jackson requirement</description>
+ </object>
+ <object name="Jackson - phenomenon" intdata="1">
+ <description>A Jackson shared phenomenon</description>
+ </object>
+ <object name="Jackson - phenomenon" intdata="2">
+ <description>A Jackson requirement phenomenon</description>
+ <icon>res:/org/gnome/Dia/Jackson/reqphen.png</icon>
+ </object>
+ </contents>
+</sheet>
diff --git a/sheets/KAOS.sheet.in b/sheets/KAOS.sheet
similarity index 66%
rename from sheets/KAOS.sheet.in
rename to sheets/KAOS.sheet
index 9e03b436..452b9533 100644
--- a/sheets/KAOS.sheet.in
+++ b/sheets/KAOS.sheet
@@ -1,87 +1,87 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>RE-KAOS</_name>
- <_description>Objects to design KAOS diagrams</_description>
+ <name>RE-KAOS</name>
+ <description>Objects to design KAOS diagrams</description>
<contents>
<object name="KAOS - goal" intdata="2">
- <_description>A KAOS softgoal</_description>
+ <description>A KAOS softgoal</description>
<icon>res:/org/gnome/Dia/KAOS/softgoal.png</icon>
</object>
<object name="KAOS - goal" intdata="1">
- <_description>A KAOS goal</_description>
+ <description>A KAOS goal</description>
</object>
<object name="KAOS - goal" intdata="3">
- <_description>A KAOS requirement</_description>
+ <description>A KAOS requirement</description>
<icon>res:/org/gnome/Dia/KAOS/requirement.png</icon>
</object>
<object name="KAOS - goal" intdata="4">
- <_description>A KAOS assumption</_description>
+ <description>A KAOS assumption</description>
<icon>res:/org/gnome/Dia/KAOS/assumption.png</icon>
</object>
<object name="KAOS - goal" intdata="5">
- <_description>A KAOS obstacle</_description>
+ <description>A KAOS obstacle</description>
<icon>res:/org/gnome/Dia/KAOS/obstacle.png</icon>
</object>
<object name="KAOS - maor" intdata="1">
- <_description>A KAOS AND refinement</_description>
+ <description>A KAOS AND refinement</description>
<icon>res:/org/gnome/Dia/KAOS/and-ref.png</icon>
</object>
<object name="KAOS - maor" intdata="2">
- <_description>A KAOS complete AND refinement</_description>
+ <description>A KAOS complete AND refinement</description>
<icon>res:/org/gnome/Dia/KAOS/and-complete-ref.png</icon>
</object>
<object name="KAOS - maor" intdata="3">
- <_description>A KAOS OR refinement</_description>
+ <description>A KAOS OR refinement</description>
<icon>res:/org/gnome/Dia/KAOS/or-ref.png</icon>
</object>
<object name="KAOS - maor" intdata="4">
- <_description>A KAOS complete OR refinement</_description>
+ <description>A KAOS complete OR refinement</description>
<icon>res:/org/gnome/Dia/KAOS/or-complete-ref.png</icon>
</object>
<object name="KAOS - maor" intdata="5">
- <_description>A KAOS operationalization</_description>
+ <description>A KAOS operationalization</description>
<icon>res:/org/gnome/Dia/KAOS/op-ref.png</icon>
</object>
<object name="KAOS - mbr" intdata="1">
- <_description>A KAOS contribution</_description>
+ <description>A KAOS contribution</description>
</object>
<object name="KAOS - mbr" intdata="2">
- <_description>A KAOS obstruction</_description>
+ <description>A KAOS obstruction</description>
<icon>res:/org/gnome/Dia/KAOS/obstructs.png</icon>
</object>
<object name="KAOS - mbr" intdata="3">
- <_description>A KAOS binary conflict</_description>
+ <description>A KAOS binary conflict</description>
<icon>res:/org/gnome/Dia/KAOS/conflicts.png</icon>
</object>
<object name="KAOS - other" intdata="1">
- <_description>A KAOS agent</_description>
+ <description>A KAOS agent</description>
</object>
<object name="KAOS - mbr" intdata="4">
- <_description>A KAOS responsibility</_description>
+ <description>A KAOS responsibility</description>
<icon>res:/org/gnome/Dia/KAOS/responsibility.png</icon>
</object>
<object name="KAOS - mbr" intdata="5">
- <_description>A KAOS monitor link</_description>
+ <description>A KAOS monitor link</description>
<icon>res:/org/gnome/Dia/KAOS/monitors.png</icon>
</object>
<object name="KAOS - mbr" intdata="6">
- <_description>A KAOS control link</_description>
+ <description>A KAOS control link</description>
<icon>res:/org/gnome/Dia/KAOS/controls.png</icon>
</object>
<object name="KAOS - mbr" intdata="7">
- <_description>A KAOS capable-of</_description>
+ <description>A KAOS capable-of</description>
<icon>res:/org/gnome/Dia/KAOS/capable-of.png</icon>
</object>
<object name="KAOS - mbr" intdata="8">
- <_description>A KAOS performs</_description>
+ <description>A KAOS performs</description>
<icon>res:/org/gnome/Dia/KAOS/performs.png</icon>
</object>
<object name="KAOS - mbr" intdata="9">
- <_description>A KAOS input</_description>
+ <description>A KAOS input</description>
<icon>res:/org/gnome/Dia/KAOS/input.png</icon>
</object>
<object name="KAOS - mbr" intdata="10">
- <_description>A KAOS output</_description>
+ <description>A KAOS output</description>
<icon>res:/org/gnome/Dia/KAOS/output.png</icon>
</object>
</contents>
diff --git a/sheets/Lights.sheet b/sheets/Lights.sheet
new file mode 100644
index 00000000..18682bcc
--- /dev/null
+++ b/sheets/Lights.sheet
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+ <name>Lights</name>
+ <description>Objects to design simple lighting plots</description>
+ <contents>
+ <object name="Lights - PAR">
+ <description>PAR</description>
+ </object>
+ <object name="Lights - PARfloor">
+ <description>PAR on the floor</description>
+ </object>
+ <object name="Lights - ACL">
+ <description>ACL</description>
+ </object>
+ <object name="Lights - PC">
+ <description>Pebble Convex lantern</description>
+ </object>
+ <object name="Lights - Fresnel">
+ <description>Fresnel lantern</description>
+ </object>
+ <object name="Lights - Striplight">
+ <description>Striplight</description>
+ </object>
+ <object name="Lights - ERS">
+ <description>Ellipsoidal Reflector Spotlight</description>
+ </object>
+ <object name="Lights - Blinders">
+ <description>Blinders</description>
+ </object>
+ <br/>
+ <object name="Lights - Blacklight">
+ <description>Black light</description>
+ </object>
+ <object name="Lights - Stroboscope">
+ <description>Stroboscope light</description>
+ </object>
+ <object name="Lights - Movinghead">
+ <description>Moving head</description>
+ </object>
+ <object name="Lights - Scanner">
+ <description>Scanner</description>
+ </object>
+ <br/>
+ <object name="Lights - Structure">
+ <description>Structure</description>
+ </object>
+ </contents>
+</sheet>
diff --git a/sheets/Logic.sheet.in b/sheets/Logic.sheet
similarity index 55%
rename from sheets/Logic.sheet.in
rename to sheets/Logic.sheet
index ead33dc3..4e47f399 100644
--- a/sheets/Logic.sheet.in
+++ b/sheets/Logic.sheet
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Logic</_name>
- <_description>Boolean Logic</_description>
+ <name>Logic</name>
+ <description>Boolean Logic</description>
<contents>
<object name="Logic - Or">
- <_description>OR gate</_description>
+ <description>OR gate</description>
</object>
<object name="Logic - And">
- <_description>AND gate</_description>
+ <description>AND gate</description>
</object>
<object name="Logic - Xor">
- <_description>XOR gate</_description>
+ <description>XOR gate</description>
</object>
<object name="Logic - Buffer">
- <_description>Simple buffer</_description>
+ <description>Simple buffer</description>
</object>
<object name="Logic - Inverter">
- <_description>Inverter</_description>
+ <description>Inverter</description>
</object>
<object name="Logic - Nand">
- <_description>NAND gate</_description>
+ <description>NAND gate</description>
</object>
<object name="Logic - Nor">
- <_description>NOR gate</_description>
+ <description>NOR gate</description>
</object>
<object name="Logic - Not">
- <_description>NOT</_description>
+ <description>NOT</description>
</object>
<object name="Logic - Connector">
- <_description>Cross-connector</_description>
+ <description>Cross-connector</description>
</object>
</contents>
</sheet>
diff --git a/sheets/MSE.sheet.in b/sheets/MSE.sheet
similarity index 52%
rename from sheets/MSE.sheet.in
rename to sheets/MSE.sheet
index d84c7ff4..68f99d72 100644
--- a/sheets/MSE.sheet.in
+++ b/sheets/MSE.sheet
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>MSE</_name>
- <_description>U.S. Army Mobile Subscriber Equipment Components</_description>
+ <name>MSE</name>
+ <description>U.S. Army Mobile Subscriber Equipment Components</description>
<contents>
<object name="Node Center">
- <_description>Node center</_description>
+ <description>Node center</description>
</object>
<object name="Large Extension Node">
- <_description>Large extension node</_description>
+ <description>Large extension node</description>
</object>
<object name="Small Extension Node">
- <_description>Small extension node</_description>
+ <description>Small extension node</description>
</object>
<object name="Tactical Satellite Communications Terminal">
- <_description>Tactical satellite communications terminal</_description>
+ <description>Tactical satellite communications terminal</description>
</object>
<object name="Multiplexer">
- <_description>Multiplexer</_description>
+ <description>Multiplexer</description>
</object>
<object name="Demultiplexer">
- <_description>Demultiplexer</_description>
+ <description>Demultiplexer</description>
</object>
</contents>
</sheet>
diff --git a/sheets/Misc.sheet.in b/sheets/Misc.sheet
similarity index 54%
rename from sheets/Misc.sheet.in
rename to sheets/Misc.sheet
index 0ff656e2..85e51ba7 100644
--- a/sheets/Misc.sheet.in
+++ b/sheets/Misc.sheet
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Miscellaneous</_name>
- <_description>Miscellaneous Shapes</_description>
+ <name>Miscellaneous</name>
+ <description>Miscellaneous Shapes</description>
<contents>
<object name="Misc - Tree">
- <_description>Tree</_description>
+ <description>Tree</description>
</object>
<object name="Filesystem - Folder">
- <_description>Folder</_description>
+ <description>Folder</description>
</object>
<object name="Filesystem - File">
- <_description>File</_description>
+ <description>File</description>
</object>
<object name="Misc - expensible node">
- <_description>expansible node</_description>
+ <description>expansible node</description>
</object>
<object name="Misc - expended node">
- <_description>expanded node</_description>
+ <description>expanded node</description>
</object>
<object name="Misc - Analog Clock">
- <_description>Traditional clock</_description>
+ <description>Traditional clock</description>
</object>
<object name="Misc - Measure" intdata="0">
- <_description>Measure distance</_description>
+ <description>Measure distance</description>
</object>
<object name="Misc - Grid">
- <_description>Resizable grid</_description>
+ <description>Resizable grid</description>
</object>
<object name="Misc - Diagram">
- <_description>Diagram object</_description>
+ <description>Diagram object</description>
</object>
<object name="Misc - Ngon">
- <_description>N-gon or Star object</_description>
+ <description>N-gon or Star object</description>
</object>
</contents>
</sheet>
diff --git a/sheets/Pneumatic.sheet.in b/sheets/Pneumatic.sheet
similarity index 54%
rename from sheets/Pneumatic.sheet.in
rename to sheets/Pneumatic.sheet
index 70c953a6..d9496818 100644
--- a/sheets/Pneumatic.sheet.in
+++ b/sheets/Pneumatic.sheet
@@ -1,79 +1,79 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Pneumatic/Hydraulic</_name>
- <_description>Components for pneumatic and hydraulic circuits</_description>
+ <name>Pneumatic/Hydraulic</name>
+ <description>Components for pneumatic and hydraulic circuits</description>
<contents>
<object name="Pneum - DEJack">
- <_description>Double-effect jack</_description>
+ <description>Double-effect jack</description>
</object>
<object name="Pneum - SEIJack">
- <_description>Normally-in simple-effect jack</_description>
+ <description>Normally-in simple-effect jack</description>
</object>
<object name="Pneum - SEOJack">
- <_description>Normally-out simple-effect jack</_description>
+ <description>Normally-out simple-effect jack</description>
</object>
<!-- TODO : shaftless double-effect jacks, shock-absorbed jacks
(all types, with fixed and variable shock absorption), rotary jacks ... -->
<br/>
<object name="Pneum - press">
- <_description>Generic pressure source</_description>
+ <description>Generic pressure source</description>
</object>
<object name="Pneum - presshy">
- <_description>Hydraulic pressure source</_description>
+ <description>Hydraulic pressure source</description>
</object>
<object name="Pneum - presspn">
- <_description>Pneumatic pressure source</_description>
+ <description>Pneumatic pressure source</description>
</object>
<object name="Pneum - drain">
- <_description>Air exhaust orifice</_description>
+ <description>Air exhaust orifice</description>
</object>
<br/>
<object name="Pneum - dist22">
- <_description>2/2 distributor</_description>
+ <description>2/2 distributor</description>
</object>
<object name="Pneum - dist32">
- <_description>3/2 distributor</_description>
+ <description>3/2 distributor</description>
</object>
<!-- <object name="Pneum - dist33">
- <_description>3/3 distributor</_description>
+ <description>3/3 distributor</description>
</object> -->
<object name="Pneum - dist42">
- <_description>4/2 distributor</_description>
+ <description>4/2 distributor</description>
</object>
<object name="Pneum - dist52">
- <_description>5/2 distributor</_description>
+ <description>5/2 distributor</description>
</object>
<!-- <object name="Pneum - dist53">
- <_description>5/3 distributor</_description>
+ <description>5/3 distributor</description>
</object> -->
<br/>
<object name="Pneum - commusc">
- <_description>Muscular command</_description>
+ <description>Muscular command</description>
</object>
<object name="Pneum - compb">
- <_description>Push-button command</_description>
+ <description>Push-button command</description>
</object>
<object name="Pneum - compush">
- <_description>Mechanical command by tappet</_description>
+ <description>Mechanical command by tappet</description>
</object>
<object name="Pneum - comspr">
- <_description>Mechanical command by spring</_description>
+ <description>Mechanical command by spring</description>
</object>
<object name="Pneum - comelec1">
- <_description>Electric command (single coil)</_description>
+ <description>Electric command (single coil)</description>
</object>
<object name="Pneum - comelec2">
- <_description>Electric command (double coil)</_description>
+ <description>Electric command (double coil)</description>
</object>
<object name="Pneum - compilh">
- <_description>Indirect command by hydraulic driver</_description>
+ <description>Indirect command by hydraulic driver</description>
</object>
<object name="Pneum - compilp">
- <_description>Indirect command by pneumatic driver</_description>
+ <description>Indirect command by pneumatic driver</description>
</object>
<br/>
<object name="Pneum - connpoint">
- <_description>Connection point</_description>
+ <description>Connection point</description>
</object>
<!-- TODO: anti-return valves, variable and non-variable stranglers,
combinations of these, pressure limiters (a whole family !), pressure
diff --git a/sheets/SADT.sheet.in b/sheets/SADT.sheet
similarity index 54%
rename from sheets/SADT.sheet.in
rename to sheets/SADT.sheet
index 94f1be95..ad522aef 100644
--- a/sheets/SADT.sheet.in
+++ b/sheets/SADT.sheet
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>SADT/IDEF0</_name>
- <_description>Objects to design SADT diagrams</_description>
+ <name>SADT/IDEF0</name>
+ <description>Objects to design SADT diagrams</description>
<contents>
<object name="SADT - arrow">
- <_description>Activity/data flow arrow</_description>
+ <description>Activity/data flow arrow</description>
</object>
<object name="SADT - box">
- <_description>Activity/data box</_description>
+ <description>Activity/data box</description>
</object>
<object name="SADT - annotation">
- <_description>Flow label</_description>
+ <description>Flow label</description>
</object>
</contents>
</sheet>
diff --git a/sheets/SDL.sheet.in b/sheets/SDL.sheet
similarity index 51%
rename from sheets/SDL.sheet.in
rename to sheets/SDL.sheet
index 5e0056b7..bcef85fd 100644
--- a/sheets/SDL.sheet.in
+++ b/sheets/SDL.sheet
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>SDL</_name>
- <_description>Specification and Description Language.</_description>
+ <name>SDL</name>
+ <description>Specification and Description Language.</description>
<contents>
<object name="SDL - Block">
- <_description>Block type reference</_description>
+ <description>Block type reference</description>
</object>
<object name="SDL - Service">
- <_description>Service type reference</_description>
+ <description>Service type reference</description>
</object>
<object name="SDL - Process">
- <_description>Process type reference</_description>
+ <description>Process type reference</description>
</object>
<object name="SDL - State">
- <_description>State</_description>
+ <description>State</description>
</object>
<object name="SDL - Function Header">
- <_description>Function header</_description>
+ <description>Function header</description>
</object>
<object name="SDL - Send">
- <_description>Send message</_description>
+ <description>Send message</description>
</object>
<object name="SDL - Receive">
- <_description>Receive message</_description>
+ <description>Receive message</description>
</object>
<object name="SDL - Function">
- <_description>Function call</_description>
+ <description>Function call</description>
</object>
<object name="SDL - Macro">
- <_description>Macro call</_description>
+ <description>Macro call</description>
</object>
<object name="SDL - Task">
- <_description>Action being executed</_description>
+ <description>Action being executed</description>
</object>
<object name="SDL - Save">
- <_description>Save state</_description>
+ <description>Save state</description>
</object>
<object name="SDL - Decision">
- <_description>Decision</_description>
+ <description>Decision</description>
</object>
<object name="SDL - InOut">
- <_description>In/Out connector</_description>
+ <description>In/Out connector</description>
</object>
<object name="SDL - Stop">
- <_description>Stop</_description>
+ <description>Stop</description>
</object>
<object name="SDL - Return">
- <_description>Procedure return</_description>
+ <description>Procedure return</description>
</object>
<object name="SDL - Comment">
- <_description>Comment</_description>
+ <description>Comment</description>
</object>
<object name="SDL - Note">
- <_description>Generic text note</_description>
+ <description>Generic text note</description>
</object>
<!-- TODO : All other objects ... -->
<br/>
diff --git a/sheets/Shape_Design.sheet.in b/sheets/Shape_Design.sheet
similarity index 52%
rename from sheets/Shape_Design.sheet.in
rename to sheets/Shape_Design.sheet
index c3fd25bb..0c35bc39 100644
--- a/sheets/Shape_Design.sheet.in
+++ b/sheets/Shape_Design.sheet
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Shape Design</_name>
- <_description>Design Dia objects with individual connection points</_description>
+ <name>Shape Design</name>
+ <description>Design Dia objects with individual connection points</description>
<contents>
<object name="Shape Design - Connection Point">
- <_description>Connection Point</_description>
+ <description>Connection Point</description>
</object>
<object name="Shape Design - Main Connection Point">
- <_description>Main Connection Point</_description>
- </object>
+ <description>Main Connection Point</description>
+ </object>
</contents>
</sheet>
diff --git a/sheets/UML.sheet.in b/sheets/UML.sheet
similarity index 56%
rename from sheets/UML.sheet.in
rename to sheets/UML.sheet
index e4c7948f..3b3fc475 100644
--- a/sheets/UML.sheet.in
+++ b/sheets/UML.sheet
@@ -1,102 +1,102 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>UML</_name>
- <_description>Editor for UML Static Structure Diagrams</_description>
+ <name>UML</name>
+ <description>Editor for UML Static Structure Diagrams</description>
<contents>
<object name="UML - Class" intdata="0">
- <_description>Class</_description>
+ <description>Class</description>
</object>
<object name="UML - Class" intdata="1">
- <_description>Template class</_description>
+ <description>Template class</description>
<icon>res:/org/gnome/Dia/UML/umlclass_template.png</icon>
</object>
<object name="UML - Note">
- <_description>Note</_description>
+ <description>Note</description>
</object>
<object name="UML - Dependency">
- <_description>Dependency</_description>
+ <description>Dependency</description>
</object>
<object name="UML - Realizes">
- <_description>Realizes, implements a specific interface</_description>
+ <description>Realizes, implements a specific interface</description>
</object>
<object name="UML - Generalization">
- <_description>Generalization, class inheritance</_description>
+ <description>Generalization, class inheritance</description>
</object>
<object name="UML - Association" intdata="0">
- <_description>Association, two classes are associated</_description>
+ <description>Association, two classes are associated</description>
</object>
<object name="UML - Association" intdata="1">
- <_description>Aggregation, one class is part of another</_description>
+ <description>Aggregation, one class is part of another</description>
<icon>res:/org/gnome/Dia/UML/aggregation.png</icon>
</object>
<object name="UML - Implements">
- <_description>Implements, class implements a specific interface</_description>
+ <description>Implements, class implements a specific interface</description>
</object>
<object name="UML - Constraint">
- <_description>Constraint, place a constraint on something</_description>
+ <description>Constraint, place a constraint on something</description>
</object>
<object name="UML - SmallPackage">
- <_description>Small package</_description>
+ <description>Small package</description>
</object>
<object name="UML - LargePackage">
- <_description>Large package</_description>
+ <description>Large package</description>
</object>
<object name="UML - Actor">
- <_description>Actor</_description>
+ <description>Actor</description>
</object>
<object name="UML - Usecase">
- <_description>Use case</_description>
+ <description>Use case</description>
</object>
<object name="UML - Lifeline">
- <_description>Lifeline</_description>
+ <description>Lifeline</description>
</object>
<object name="UML - Object">
- <_description>Object</_description>
+ <description>Object</description>
</object>
<object name="UML - Message">
- <_description>Message</_description>
+ <description>Message</description>
</object>
<object name="UML - Component">
- <_description>Component</_description>
+ <description>Component</description>
</object>
<object name="UML - Component Feature" intdata="0">
- <_description>Facet</_description>
+ <description>Facet</description>
</object>
<object name="UML - Component Feature" intdata="1">
- <_description>Receptacle</_description>
+ <description>Receptacle</description>
<icon>res:/org/gnome/Dia/UML/receptacle.png</icon>
</object>
<object name="UML - Component Feature" intdata="2">
- <_description>Event Source</_description>
+ <description>Event Source</description>
<icon>res:/org/gnome/Dia/UML/eventsource.png</icon>
</object>
<object name="UML - Component Feature" intdata="3">
- <_description>Event Sink</_description>
+ <description>Event Sink</description>
<icon>res:/org/gnome/Dia/UML/eventsink.png</icon>
</object>
<object name="UML - Node">
- <_description>Node</_description>
+ <description>Node</description>
</object>
<object name="UML - Classicon">
- <_description>Class stereotype icon</_description>
+ <description>Class stereotype icon</description>
</object>
<object name="UML - State Term">
- <_description>Initial/End state</_description>
+ <description>Initial/End state</description>
</object>
<object name="UML - State">
- <_description>State</_description>
+ <description>State</description>
</object>
<object name="UML - Activity">
- <_description>Activity</_description>
+ <description>Activity</description>
</object>
<object name="UML - Branch">
- <_description>Branch</_description>
+ <description>Branch</description>
</object>
<object name="UML - Fork">
- <_description>Fork/Union</_description>
+ <description>Fork/Union</description>
</object>
<object name="UML - Transition">
- <_description>Transition</_description>
+ <description>Transition</description>
</object>
</contents>
</sheet>
diff --git a/sheets/chronogram.sheet.in b/sheets/chronogram.sheet
similarity index 59%
rename from sheets/chronogram.sheet.in
rename to sheets/chronogram.sheet
index 8d67c804..bbdef959 100644
--- a/sheets/chronogram.sheet.in
+++ b/sheets/chronogram.sheet
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Chronogram</_name>
- <_description>Objects to design chronogram charts</_description>
+ <name>Chronogram</name>
+ <description>Objects to design chronogram charts</description>
<contents>
<object name="chronogram - reference">
- <_description>Time scale</_description>
+ <description>Time scale</description>
</object>
<object name="chronogram - line">
- <_description>Data line</_description>
+ <description>Data line</description>
</object>
</contents>
</sheet>
diff --git a/sheets/ciscocomputer.sheet b/sheets/ciscocomputer.sheet
new file mode 100644
index 00000000..01769f74
--- /dev/null
+++ b/sheets/ciscocomputer.sheet
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+ <name>Cisco — Computer</name>
+ <description>Computer shapes by Cisco</description>
+ <contents>
+<object name="Cisco - PC"><description>PC</description></object>
+<object name="Cisco - Macintosh"><description>Macintosh</description></object>
+ <object name="Cisco - Terminal">
+ <description>Terminal</description>
+ </object>
+<object name="Cisco - SUN workstation"><description>SUN workstation</description></object>
+<object name="Cisco - CiscoWorks workstation"><description>CiscoWorks workstation</description></object>
+<object name="Cisco - PC Router Card"><description>PC Router Card</description></object>
+<object name="Cisco - PC Software"><description>PC Software</description></object>
+<object name="Cisco - PC with Router-Based Software"><description>PC with Router-Based
Software</description></object>
+<object name="Cisco - Workgroup director"><description>Workgroup director</description></object>
+<object name="Cisco - CiscoSecurity"><description>CiscoSecurity</description></object>
+<object name="Cisco - Cisco CA"><description>Cisco CA</description></object>
+<object name="Cisco - WWW server"><description>WWW server</description></object>
+<object name="Cisco - Web browser"><description>Web browser</description></object>
+<object name="Cisco - File Server"><description>File Server</description></object>
+<object name="Cisco - Software based server"><description>Software-Based Router on File
Server</description></object>
+<object name="Cisco - Server with PC Router"><description>Server with PC Router</description></object>
+<object name="Cisco - IBM Tower"><description>IBM Tower</description></object>
+<object name="Cisco - IBM Mini (AS400)"><description>IBM Mini (AS400)</description></object>
+<object name="Cisco - Front End Processor"><description>Front End Processor</description></object>
+<object name="Cisco - IBM mainframe"><description>IBM mainframe</description></object>
+<object name="Cisco - IBM mainframe with FEP"><description>IBM mainframe with FEP</description></object>
+<object name="Cisco - HP Mini"><description>HP Mini</description></object>
+<object name="Cisco - Supercomputer"><description>Supercomputer</description></object>
+<object name="Cisco - Web cluster"><description>Web cluster</description></object>
+<object name="Cisco - Mini VAX"><description>Mini VAX</description></object>
+<object name="Cisco - PC Card"><description>PC Card</description></object>
+<object name="Cisco - Scanner"><description>Scanner</description></object>
+<object name="Cisco - Tablet"><description>Tablet</description></object>
+<object name="Cisco - EtherClient"><description>EtherClient</description></object>
+<object name="Cisco - Handheld"><description>Handheld</description></object>
+<object name="Cisco - Wireless"><description>Wireless</description></object>
+<object name="Cisco - PDA"><description>PDA</description></object>
+<object name="Cisco - Newton"><description>Newton</description></object>
+<object name="Cisco - Laptop"><description>Laptop</description></object>
+ <object name="Cisco - Printer">
+ <description>Printer</description>
+ </object>
+<object name="Cisco - Monitor"><description>Monitor</description></object>
+<object name="Cisco - PC Video"><description>PC Video</description></object>
+<object name="Cisco - Modem"><description>Modem</description></object>
+<object name="Cisco - BBS"><description>BBS</description></object>
+<object name="Cisco - MicroWebserver"><description>MicroWebserver</description></object>
+<object name="Cisco - Relational Database"><description>Relational Database</description></object>
+<object name="Cisco - Diskette"><description>Diskette</description></object>
+<object name="Cisco - Host"><description>Host</description></object>
+<object name="Cisco - Tape array"><description>Tape array</description></object>
+<object name="Cisco - Disk subsystem"><description>Disk subsystem</description></object>
+<object name="Cisco - JBOD"><description>JBOD</description></object>
+<object name="Cisco - Storage array"><description>Storage array</description></object>
+<object name="Cisco - FC Storage"><description>FC Storage</description></object>
+<object name="Cisco - PC Adapter Card"><description>PC Adapter Card</description></object>
+ </contents>
+</sheet>
diff --git a/sheets/ciscohub.sheet b/sheets/ciscohub.sheet
new file mode 100644
index 00000000..cc49ea62
--- /dev/null
+++ b/sheets/ciscohub.sheet
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+ <name>Cisco — Switch</name>
+ <description>Router and switch shapes by Cisco</description>
+ <contents>
+<object name="Cisco - Router"><description>Router</description></object>
+<object name="Cisco - Router subdued"><description>Router subdued</description></object>
+<object name="Cisco - Router with Silicon Switch"><description>Router with Silicon
Switch</description></object>
+<object name="Cisco - NetFlow router"><description>NetFlow router</description></object>
+<object name="Cisco - Broadband router"><description>Broadband router</description></object>
+<object name="Cisco - Wavelength router"><description>Wavelength router</description></object>
+<object name="Cisco - Wireless router"><description>Wireless router</description></object>
+<object name="Cisco - 7507 Router"><description>7507 Router</description></object>
+<object name="Cisco - 7505 Router"><description>7505 Router</description></object>
+<object name="Cisco - 7500ARS (7513) Router"><description>7500ARS (7513) Router</description></object>
+<object name="Cisco - Edge Label Switch Router with NetFlow"><description>Edge Label Switch Router with
NetFlow</description></object>
+<object name="Cisco - ATM Router"><description>Edge Label Switch Router</description></object>
+<object name="Cisco - Router with Firewall"><description>Router with Firewall</description></object>
+<object name="Cisco - Optical Services Router"><description>Optical Services Router</description></object>
+<object name="Cisco - Content Service Router"><description>Content Router</description></object>
+<object name="Cisco - Carrier Routing System"><description>Carrier Routing System</description></object>
+<object name="Cisco - Storage Router"><description>Storage Router</description></object>
+<object name="Cisco - NetSonar"><description>NetSonar</description></object>
+<object name="Cisco - Hub"><description>Hub</description></object>
+<object name="Cisco - Hub subdued"><description>Hub subdued</description></object>
+<object name="Cisco - Cisco Hub"><description>Cisco Hub</description></object>
+<object name="Cisco - Small hub"><description>Small Hub</description></object>
+<object name="Cisco - 100BaseT Hub"><description>100BaseT Hub</description></object>
+<object name="Cisco - Workgroup switch"><description>Workgroup switch</description></object>
+<object name="Cisco - Workgroup switch Subdued"><description>Workgroup switch Subdued</description></object>
+<object name="Cisco - Voice switch"><description>Workgroup Switch Voice-Enabled</description></object>
+<object name="Cisco - BBSM"><description>BBSM</description></object>
+<object name="Cisco - ATM Tag Switch Router"><description>ATM Tag Switch Router</description></object>
+<object name="Cisco - Switch Processor"><description>Switch Processor</description></object>
+<object name="Cisco - Route Switch Processor"><description>Route Switch Processor</description></object>
+<object name="Cisco - Route Switch Processor with Si"><description>Route Switch Processor with
Si</description></object>
+<object name="Cisco - PXF"><description>PXF</description></object>
+<object name="Cisco - ASIC Processor"><description>ASIC Processor</description></object>
+<object name="Cisco - Generic processor"><description>Generic Processor</description></object>
+<object name="Cisco - Data Center Switch"><description>Data Center Switch</description></object>
+<object name="Cisco - Data Center Switch Reversed"><description>Data Center Switch
Reversed</description></object>
+<object name="Cisco - Data Switch Processor"><description>Data Switch Processor</description></object>
+<object name="Cisco - Content Switch"><description>Content Switch</description></object>
+<object name="Cisco - Content Switch module"><description>Content Service Module</description></object>
+<object name="Cisco - CSM-S"><description>CSM-S</description></object>
+<object name="Cisco - Access Gateway"><description>Access Gateway</description></object>
+<object name="Cisco - ATM Switch"><description>ATM Switch</description></object>
+<object name="Cisco - ATM 3800"><description>ATM 3800</description></object>
+<object name="Cisco - Cisco 1000"><description>Cisco 1000</description></object>
+<object name="Cisco - ISDN switch"><description>ISDN switch</description></object>
+<object name="Cisco - ATM Tag Sw Gigabit Router"><description>Label Switch Router</description></object>
+<object name="Cisco - MultiSwitch Device"><description>MultiSwitch Device</description></object>
+<object name="Cisco - LAN2LAN Switch"><description>LAN2LAN Switch</description></object>
+<object name="Cisco - Multilayer switch"><description>Multilayer Switch</description></object>
+<object name="Cisco - Multilayer Switch with Silicon"><description>Multilayer Switch with
Silicon</description></object>
+<object name="Cisco - Multilayer Switch with Silicon subdued"><description>Multilayer Switch with Silicon
subdued</description></object>
+<object name="Cisco - Programmable Switch"><description>Programmable Switch</description></object>
+<object name="Cisco - Content Service Switch 1100"><description>Content Service Switch
1100</description></object>
+<object name="Cisco - ATM Fast Gigabit Etherswitch"><description>ATM Fast Gigabit
Etherswitch</description></object>
+<object name="Cisco - RateMUX"><description>RateMUX</description></object>
+<object name="Cisco - Workgroup 5500"><description>Workgroup 5500</description></object>
+<object name="Cisco - Workgroup 5000"><description>Workgroup 5000</description></object>
+<object name="Cisco - Workgroup 5002"><description>Workgroup 5002</description></object>
+<object name="Cisco - NetRanger"><description>NetRanger</description></object>
+<object name="Cisco - MGX 8220"><description>MGX 8220</description></object>
+<object name="Cisco - MGX 8240"><description>MGX 8240</description></object>
+<object name="Cisco - MGX 8260"><description>MGX 8260</description></object>
+<object name="Cisco - Universal Gateway"><description>Universal Gateway</description></object>
+<object name="Cisco - iSCSI switch"><description>iSCSI switch</description></object>
+<object name="Cisco - Workgroup Fibre Channel intelligent switch"><description>Workgroup Fibre Channel
intelligent switch</description></object>
+<object name="Cisco - Director-class Fibre Channel intelligent switch"><description>Director-class Fibre
Channel intelligent switch</description></object>
+<object name="Cisco - Multi-Fabric Server Switch"><description>Multi-Fabric Server
Switch</description></object>
+<object name="Cisco - Server Switch"><description>Server Switch</description></object>
+<object name="Cisco - Multilayer Remote Switch"><description>Multilayer Remote Switch</description></object>
+<object name="Cisco - Layer 2 Remote Switch"><description>Layer 2 Remote Switch</description></object>
+<object name="Cisco - Virtual Layer Switch"><description>Virtual Layer Switch</description></object>
+ </contents>
+</sheet>
diff --git a/sheets/ciscomisc.sheet b/sheets/ciscomisc.sheet
new file mode 100644
index 00000000..ec596caa
--- /dev/null
+++ b/sheets/ciscomisc.sheet
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+ <name>Cisco — Miscellaneous</name>
+ <description>Miscellaneous shapes by Cisco</description>
+ <contents>
+<object name="Cisco - Government Building"><description>Government Building</description></object>
+<object name="Cisco - University"><description>University</description></object>
+<object name="Cisco - Small Business"><description>Small Business</description></object>
+<object name="Cisco - Home office"><description>Home office</description></object>
+<object name="Cisco - Branch office"><description>Branch office</description></object>
+<object name="Cisco - Branch office subdued"><description>Branch office subdued</description></object>
+<object name="Cisco - Branch office blue"><description>Branch office blue</description></object>
+<object name="Cisco - Generic Building"><description>Generic Building</description></object>
+<object name="Cisco - Generic Building subdued"><description>Generic Building subdued</description></object>
+<object name="Cisco - Generic Building blue"><description>Generic Building blue</description></object>
+<object name="Cisco - Medium Building"><description>Medium Building</description></object>
+<object name="Cisco - Medium Building subdued"><description>Medium Building subdued</description></object>
+<object name="Cisco - Medium Building blue"><description>Medium Building blue</description></object>
+<object name="Cisco - House"><description>House</description></object>
+<object name="Cisco - House blue"><description>House blue</description></object>
+<object name="Cisco - Telecommuter house"><description>Telecommuter house</description></object>
+<object name="Cisco - Telecommuter house subdued"><description>Telecommuter house
subdued</description></object>
+<object name="Cisco - MDU"><description>MDU</description></object>
+<object name="Cisco - Man"><description>Man</description></object>
+<object name="Cisco - Man red"><description>Man red</description></object>
+<object name="Cisco - Man gold"><description>Man gold</description></object>
+<object name="Cisco - Man blue"><description>Man blue</description></object>
+<object name="Cisco - Standing Man"><description>Standing Man</description></object>
+<object name="Cisco - Standing woman"><description>Standing woman</description></object>
+<object name="Cisco - Woman"><description>Woman</description></object>
+<object name="Cisco - Woman red"><description>Woman red</description></object>
+<object name="Cisco - Woman gold"><description>Woman gold</description></object>
+<object name="Cisco - Woman blue"><description>Woman blue</description></object>
+<object name="Cisco - Running man"><description>Running man</description></object>
+<object name="Cisco - Running man subdued"><description>Running man subdued</description></object>
+<object name="Cisco - Telecommuter"><description>Telecommuter</description></object>
+<object name="Cisco - Running woman"><description>Running woman</description></object>
+<object name="Cisco - CiscoWorks Man"><description>CiscoWorks Man</description></object>
+<object name="Cisco - PC Man">
+ <alias name="Cisco - PC Man left"/>
+ <description>PC Man</description>
+</object>
+<object name="Cisco - Sitting woman">
+ <alias name="Cisco - Sitting Woman right"/>
+ <description>Sitting Woman</description>
+</object>
+<object name="Cisco - Mac Woman"><description>Mac Woman</description></object>
+<object name="Cisco - Androgynous Person"><description>Androgynous Person</description></object>
+<object name="Cisco - Lock"><description>Lock</description></object>
+<object name="Cisco - Key"><description>Key</description></object>
+<object name="Cisco - Lock and Key"><description>Lock and Key</description></object>
+<object name="Cisco - Satellite dish"><description>Satellite dish</description></object>
+<object name="Cisco - Satellite"><description>Satellite</description></object>
+<object name="Cisco - Antenna"><description>Antenna</description></object>
+<object name="Cisco - File cabinet"><description>File cabinet</description></object>
+<object name="Cisco - Car"><description>Car</description></object>
+<object name="Cisco - Truck"><description>Truck</description></object>
+<object name="Cisco - Video camera">
+ <alias name="Cisco - Video Camera right"/>
+ <description>Video Camera</description>
+</object>
+<object name="Cisco - Microphone"><description>Microphone</description></object>
+<object name="Cisco - Headphones"><description>Headphones</description></object>
+<object name="Cisco - Speaker"><description>Speaker</description></object>
+ </contents>
+</sheet>
+
diff --git a/sheets/cisconetwork.sheet b/sheets/cisconetwork.sheet
new file mode 100644
index 00000000..753143e8
--- /dev/null
+++ b/sheets/cisconetwork.sheet
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+ <name>Cisco — Network</name>
+ <description>Network shapes by Cisco</description>
+ <contents>
+<object name="Cisco - Network Management"><description>Network Management</description></object>
+<object name="Cisco - Detector"><description>Detector</description></object>
+<object name="Cisco - Protocol Translator"><description>Protocol Translator</description></object>
+<object name="Cisco - IP"><description>IP</description></object>
+<object name="Cisco - IP Old-style"><description>IP Old-style</description></object>
+<object name="Cisco - NAT"><description>NAT</description></object>
+<object name="Cisco - VIP"><description>VIP</description></object>
+<object name="Cisco - Terminal Server"><description>Terminal Server</description></object>
+<object name="Cisco - Access server"><description>Access Server</description></object>
+<object name="Cisco - System controller"><description>System controller</description></object>
+<object name="Cisco - Directory Server"><description>Directory Server</description></object>
+<object name="Cisco - Firewall"><description>Firewall</description></object>
+<object name="Cisco - Firewall subdued"><description>Firewall subdued</description></object>
+<object name="Cisco - Firewall horizontal"><description>Firewall horizontal</description></object>
+<object name="Cisco - Firewall Service Module"><description>Firewall Service Module</description></object>
+<object name="Cisco - IOS Firewall"><description>IOS Firewall</description></object>
+<object name="Cisco - PIX Firewall">
+ <alias name="Cisco - PIX Firewall Left"/>
+ <description>PIX Firewall</description>
+</object>
+<object name="Cisco - Centri Firewall"><description>Centri Firewall</description></object>
+<object name="Cisco - Guard"><description>Guard</description></object>
+<object name="Cisco - Security appliance"><description>Security appliance</description></object>
+<object name="Cisco - VPN concentrator"><description>VPN Concentrator</description></object>
+<object name="Cisco - VPN Gateway"><description>VPN Gateway</description></object>
+<object name="Cisco - LAN to LAN"><description>LAN to LAN</description></object>
+<object name="Cisco - SSL Terminator"><description>SSL Terminator</description></object>
+<object name="Cisco - IP DSL"><description>IP DSL Switch</description></object>
+<object name="Cisco - DSLAM"><description>DSLAM</description></object>
+<object name="Cisco - Cable Modem"><description>Cable Modem</description></object>
+<object name="Cisco - Wireless Connectivity"><description>Wireless Connectivity</description></object>
+<object name="Cisco - Wireless Transport"><description>Wireless Transport</description></object>
+<object name="Cisco - AccessPoint"><description>AccessPoint</description></object>
+<object name="Cisco - Wireless Bridge"><description>Wireless Bridge</description></object>
+<object name="Cisco - Dual Mode AccessPoint"><description>Dual Mode AccessPoint</description></object>
+<object name="Cisco - Wi-Fi Tag"><description>Wi-Fi Tag</description></object>
+<object name="Cisco - Wireless Location Appliance"><description>Wireless Location
Appliance</description></object>
+<object name="Cisco - Location server"><description>Location server</description></object>
+<object name="Cisco - Lightweight AP"><description>Lightweight AP</description></object>
+<object name="Cisco - WLAN controller"><description>WLAN controller</description></object>
+<object name="Cisco - BBFW"><description>BBFW</description></object>
+<object name="Cisco - BBFW media"><description>BBFW media</description></object>
+<object name="Cisco - Channelized Pipe"><description>Channelized Pipe</description></object>
+<object name="Cisco - Concatenated Payload"><description>Concatenated Payload</description></object>
+<object name="Cisco - Optical Cross-Connect"><description>Optical Cross-Connect</description></object>
+<object name="Cisco - Optical Transport"><description>Optical Transport</description></object>
+<object name="Cisco - Optical Fiber"><description>Optical Fiber</description></object>
+<object name="Cisco - Optical Amplifier"><description>Optical Amplifier</description></object>
+<object name="Cisco - Digital Cross-Connect"><description>Digital Cross-Connect</description></object>
+<object name="Cisco - IPTC"><description>IP Transport Concentrator</description></object>
+<object name="Cisco - DWDM Filter"><description>DWDM Filter</description></object>
+<object name="Cisco - WDM"><description>WDM</description></object>
+<object name="Cisco - 15200"><description>15200</description></object>
+<object name="Cisco - 15800"><description>15800</description></object>
+<object name="Cisco - ONS15104"><description>ONS15104</description></object>
+<object name="Cisco - 10700"><description>10700</description></object>
+<object name="Cisco - Metro 1500"><description>Metro 1500</description></object>
+<object name="Cisco - ONS15500"><description>ONS15540</description></object>
+<object name="Cisco - Automatic Protection Switching"><description>Automatic Protection
Switching</description></object>
+<object name="Cisco - RPS"><description>RPS</description></object>
+<object name="Cisco - UPS"><description>UPS</description></object>
+<object name="Cisco - LongReach CPE"><description>LongReach CPE</description></object>
+<object name="Cisco - 3X74 (floor) cluster controller"><description>3X74 (floor) cluster
controller</description></object>
+<object name="Cisco - 3174 (desktop) cluster controller"><description>3174 (desktop) cluster
controller</description></object>
+<object name="Cisco - CSU/DSU"><description>CSU/DSU</description></object>
+<object name="Cisco - WAN"><description>WAN</description></object>
+<object name="Cisco - Cloud"><description>Cloud</description></object>
+<object name="Cisco - Cloud Gold"><description>Cloud Gold</description></object>
+<object name="Cisco - Cloud White"><description>Cloud White</description></object>
+<object name="Cisco - Cloud Dark"><description>Cloud Dark</description></object>
+<object name="Cisco - Distributed Director"><description>Distributed Director</description></object>
+<object name="Cisco - LocalDirector"><description>LocalDirector</description></object>
+<object name="Cisco - IOS SLB"><description>IOS SLB</description></object>
+<object name="Cisco - MUX"><description>MUX</description></object>
+<object name="Cisco - General appliance"><description>General Appliance</description></object>
+<object name="Cisco - PAD X.28">
+ <!-- compatibility
+ <alias name="Cisco - PAD"/> -->
+ <description>PAD</description>
+</object>
+<object name="Cisco - CDDI-FDDI"><description>CDDI/FDDI Concentrator</description></object>
+<object name="Cisco - FDDI Ring"><description>FDDI Ring</description></object>
+<object name="Cisco - TokenRing"><description>TokenRing</description></object>
+<object name="Cisco - MAU"><description>MAU</description></object>
+<object name="Cisco - Repeater"><description>Repeater</description></object>
+<object name="Cisco - Bridge"><description>Bridge</description></object>
+<object name="Cisco - Breakout box"><description>Breakout box</description></object>
+<object name="Cisco - STB (set top box)"><description>STB (set top box)</description></object>
+<object name="Cisco - TV"><description>TV</description></object>
+<object name="Cisco - IPTV broadcast server"><description>IPTV broadcast server</description></object>
+<object name="Cisco - IPTV content manager"><description>IPTV content manager</description></object>
+<object name="Cisco - VN2900"><description>VN2900</description></object>
+<object name="Cisco - VN5902"><description>VN5902</description></object>
+<object name="Cisco - VN5900"><description>VN5900</description></object>
+<object name="Cisco - Catalyst Access Gateway"><description>Catalyst Access Gateway</description></object>
+<object name="Cisco - Generic gateway"><description>Generic Gateway</description></object>
+<object name="Cisco - Transpath"><description>TransPath</description></object>
+<object name="Cisco - uBR910"><description>uBR910 Cable DSU</description></object>
+<object name="Cisco - Storage Solution Engine"><description>Storage Solution Engine</description></object>
+<object name="Cisco - Content Engine (Cache Director)"><description>Content Engine (Cache
Director)</description></object>
+<object name="Cisco - CDM Content Distribution Manager"><description>CDM Content Distribution
Manager</description></object>
+<object name="Cisco - Content Transformation Engine (CTE)"><description>Content Transformation Engine
(CTE)</description></object>
+<object name="Cisco - ME 1100"><description>ME 1100</description></object>
+<object name="Cisco - MAS Gateway"><description>MAS Gateway</description></object>
+<object name="Cisco - File Engine"><description>File Engine</description></object>
+<object name="Cisco - Service Control"><description>Service Control</description></object>
+ </contents>
+</sheet>
diff --git a/sheets/ciscotelephony.sheet b/sheets/ciscotelephony.sheet
new file mode 100644
index 00000000..5a807cf8
--- /dev/null
+++ b/sheets/ciscotelephony.sheet
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
+ <name>Cisco — Telephony</name>
+ <description>Telephony shapes by Cisco</description>
+ <contents>
+<object name="Cisco - Phone"><description>Phone</description></object>
+<object name="Cisco - Phone 2"><description>Phone 2</description></object>
+<object name="Cisco - Phone Ethernet"><description>Phone Ethernet</description></object>
+<object name="Cisco - Phone Appliance"><description>Phone Appliance</description></object>
+<object name="Cisco - Phone Feature"><description>Phone Feature</description></object>
+<object name="Cisco - Phone/Fax"><description>Phone/Fax</description></object>
+<object name="Cisco - HootPhone"><description>HootPhone</description></object>
+<object name="Cisco - IP Phone"><description>IP Phone</description></object>
+<object name="Cisco - IP Softphone"><description>IP Softphone</description></object>
+<object name="Cisco - Softphone"><description>Softphone</description></object>
+<object name="Cisco - Cellular phone"><description>Cellular Phone</description></object>
+<object name="Cisco - Mobile Access IP Phone"><description>Mobile Access IP Phone</description></object>
+<object name="Cisco - Pager"><description>Pager</description></object>
+<object name="Cisco - Fax"><description>Fax</description></object>
+<object name="Cisco - Turret"><description>Turret</description></object>
+<object name="Cisco - Octel"><description>Octel</description></object>
+<object name="Cisco - Radio Tower"><description>Radio Tower</description></object>
+<object name="Cisco - PBX"><description>PBX</description></object>
+<object name="Cisco - PBX Switch"><description>PBX Switch</description></object>
+<object name="Cisco - Class 4/5 switch"><description>Class 4/5 switch</description></object>
+<object name="Cisco - SONET MUX"><description>SONET MUX</description></object>
+<object name="Cisco - ADM"><description>ADM</description></object>
+<object name="Cisco - ITP"><description>ITP</description></object>
+<object name="Cisco - ATA"><description>ATA</description></object>
+<object name="Cisco - SIP Proxy server"><description>SIP Proxy Server</description></object>
+<object name="Cisco - Gatekeeper"><description>Gatekeeper</description></object>
+<object name="Cisco - MGX 8000 Series Voice Gateway"><description>MGX 8000 Series Voice
Gateway</description></object>
+<object name="Cisco - End Office"><description>End Office</description></object>
+<object name="Cisco - Voice commserver"><description>Voice-Enabled Access Server</description></object>
+<object name="Cisco - Voice router"><description>Voice-Enabled Router</description></object>
+<object name="Cisco - Voice ATM Switch"><description>Voice-Enabled ATM Switch</description></object>
+<object name="Cisco - CallManager"><description>CallManager</description></object>
+<object name="Cisco - IP Telephony Router"><description>IP Telephony Router</description></object>
+<object name="Cisco - Mobile Access Router"><description>Mobile Access Router</description></object>
+<object name="Cisco - H.323"><description>H.323</description></object>
+<object name="Cisco - STP"><description>STP</description></object>
+<object name="Cisco - BTS 10200"><description>BTS 10200</description></object>
+<object name="Cisco - Generic softswitch"><description>Generic softswitch</description></object>
+<object name="Cisco - SC2200/VSC3000 host"><description>SC2200/VSC3000 host</description></object>
+<object name="Cisco - Virtual switch controller (VSC 3000)"><description>Virtual switch controller (VSC
3000)</description></object>
+<object name="Cisco - SC2200 (Signalling Controller)"><description>SC2200 (Signalling
Controller)</description></object>
+<object name="Cisco - MoH server (Music on Hold)"><description>MoH server (Music on
Hold)</description></object>
+<object name="Cisco - TDM router"><description>TDM router</description></object>
+<object name="Cisco - 6701"><description>6701</description></object>
+<object name="Cisco - 6705"><description>6705</description></object>
+<object name="Cisco - 6732"><description>6732</description></object>
+<object name="Cisco - IAD router"><description>IAD router</description></object>
+<object name="Cisco - ICS"><description>ICS</description></object>
+<object name="Cisco - ICM"><description>ICM</description></object>
+<object name="Cisco - IntelliSwitch Stack"><description>IntelliSwitch Stack</description></object>
+<object name="Cisco - Unity server"><description>Unity server</description></object>
+<object name="Cisco - Unity Express"><description>Unity Express</description></object>
+<object name="Cisco - MCU"><description>MCU</description></object>
+<object name="Cisco - uMG series"><description>uMG series</description></object>
+ </contents>
+</sheet>
diff --git a/sheets/civil.sheet.in b/sheets/civil.sheet
similarity index 52%
rename from sheets/civil.sheet.in
rename to sheets/civil.sheet
index 2eb5f325..e94fae7e 100644
--- a/sheets/civil.sheet.in
+++ b/sheets/civil.sheet
@@ -1,88 +1,88 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Civil</_name>
- <_description>Civil Engineering Components</_description>
+ <name>Civil</name>
+ <description>Civil Engineering Components</description>
<contents>
<object name="Civil - Vertical Rest">
- <_description>Vertical rest</_description>
+ <description>Vertical rest</description>
</object>
<object name="Civil - Horizontal Rest">
- <_description>Horizontal rest</_description>
+ <description>Horizontal rest</description>
</object>
<object name="Civil - Bivalent Vertical Rest">
- <_description>Bivalent vertical rest</_description>
+ <description>Bivalent vertical rest</description>
</object>
<object name="Civil - Reference Line">
- <_description>Reference line</_description>
+ <description>Reference line</description>
</object>
<object name="Civil - Water Level">
- <_description>Water level</_description>
+ <description>Water level</description>
</object>
<object name="Civil - Soil">
- <_description>Soil</_description>
+ <description>Soil</description>
</object>
<object name="Civil - Right Arrow">
- <_description>Horizontally aligned arrow</_description>
+ <description>Horizontally aligned arrow</description>
</object>
<object name="Civil - Up Arrow">
- <_description>Vertically aligned arrow</_description>
+ <description>Vertically aligned arrow</description>
</object>
<object name="Civil - Horizontal Limiting Line">
- <_description>Horizontal limiting line</_description>
+ <description>Horizontal limiting line</description>
</object>
<object name="Civil - Vertical Limiting Line">
- <_description>Vertical limiting line</_description>
+ <description>Vertical limiting line</description>
</object>
<object name="Civil - Horizontal Pump">
- <_description>Horizontally aligned pump</_description>
+ <description>Horizontally aligned pump</description>
</object>
<object name="Civil - Vertical Pump">
- <_description>Vertically aligned pump</_description>
+ <description>Vertically aligned pump</description>
</object>
<object name="Civil - Horizontal Compressor">
- <_description>Horizontally aligned compressor</_description>
+ <description>Horizontally aligned compressor</description>
</object>
<object name="Civil - Vertical Compressor">
- <_description>Vertically aligned compressor</_description>
+ <description>Vertically aligned compressor</description>
</object>
<object name="Flowchart - Collate">
- <_description>Vertically aligned valve</_description>
+ <description>Vertically aligned valve</description>
</object>
<object name="Civil - Horizontal Valve">
- <_description>Horizontally aligned valve</_description>
+ <description>Horizontally aligned valve</description>
</object>
<object name="Civil - Backflow Preventer">
- <_description>Backflow preventer</_description>
+ <description>Backflow preventer</description>
</object>
<object name="Civil - Motor">
- <_description>Motor</_description>
+ <description>Motor</description>
</object>
<object name="Civil - Gas Bottle">
- <_description>Gas bottle</_description>
+ <description>Gas bottle</description>
</object>
<object name="Civil - Frequency Converter">
- <_description>Frequency converter</_description>
+ <description>Frequency converter</description>
</object>
<object name="Civil - Vertical Propeller">
- <_description>Vertically aligned propeller</_description>
+ <description>Vertically aligned propeller</description>
</object>
<object name="Civil - Aerator">
- <_description>Aerator with bubbles</_description>
+ <description>Aerator with bubbles</description>
</object>
<object name="Civil - Rotor">
- <_description>Rotor</_description>
+ <description>Rotor</description>
</object>
<object name="Civil - Final-Settling Basin">
- <_description>Final-settling basin</_description>
+ <description>Final-settling basin</description>
</object>
<object name="Civil - Preliminary Clarification Tank">
- <_description>Preliminary clarification tank</_description>
+ <description>Preliminary clarification tank</description>
</object>
<object name="Civil - Basin">
- <_description>Basin</_description>
+ <description>Basin</description>
</object>
<object name="Civil - Container">
- <_description>Container</_description>
+ <description>Container</description>
</object>
</contents>
</sheet>
diff --git a/sheets/jigsaw.sheet.in b/sheets/jigsaw.sheet
similarity index 51%
rename from sheets/jigsaw.sheet.in
rename to sheets/jigsaw.sheet
index 6eafdcf5..9a95bcab 100644
--- a/sheets/jigsaw.sheet.in
+++ b/sheets/jigsaw.sheet
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Jigsaw</_name>
- <_description>Pieces of a jigsaw</_description>
+ <name>Jigsaw</name>
+ <description>Pieces of a jigsaw</description>
<contents>
<object name="Jigsaw - part_oioi">
- <_description>Jigsaw — part_oioi</_description>
+ <description>Jigsaw — part_oioi</description>
</object>
<object name="Jigsaw - part_ioio">
- <_description>Jigsaw — part_ioio</_description>
+ <description>Jigsaw — part_ioio</description>
</object>
<object name="Jigsaw - part_iiii">
- <_description>Jigsaw — part_iiii</_description>
+ <description>Jigsaw — part_iiii</description>
</object>
<object name="Jigsaw - part_oooo">
- <_description>Jigsaw — part_oooo</_description>
+ <description>Jigsaw — part_oooo</description>
</object>
<br/>
<object name="Jigsaw - part_oooi">
- <_description>Jigsaw — part_oooi</_description>
+ <description>Jigsaw — part_oooi</description>
</object>
<object name="Jigsaw - part_iooo">
- <_description>Jigsaw — part_iooo</_description>
+ <description>Jigsaw — part_iooo</description>
</object>
<object name="Jigsaw - part_oioo">
- <_description>Jigsaw — part_oioo</_description>
+ <description>Jigsaw — part_oioo</description>
</object>
<object name="Jigsaw - part_ooio">
- <_description>Jigsaw — part_ooio</_description>
+ <description>Jigsaw — part_ooio</description>
</object>
<br/>
<object name="Jigsaw - part_iioo">
- <_description>Jigsaw — part_iioo</_description>
+ <description>Jigsaw — part_iioo</description>
</object>
<object name="Jigsaw - part_oiio">
- <_description>Jigsaw — part_oiio</_description>
+ <description>Jigsaw — part_oiio</description>
</object>
<object name="Jigsaw - part_ooii">
- <_description>Jigsaw — part_ooii</_description>
+ <description>Jigsaw — part_ooii</description>
</object>
<object name="Jigsaw - part_iooi">
- <_description>Jigsaw — part_iooi</_description>
+ <description>Jigsaw — part_iooi</description>
</object>
<br/>
<object name="Jigsaw - part_oiii">
- <_description>Jigsaw — part_oiii</_description>
+ <description>Jigsaw — part_oiii</description>
</object>
<object name="Jigsaw - part_ioii">
- <_description>Jigsaw — part_ioii</_description>
+ <description>Jigsaw — part_ioii</description>
</object>
<object name="Jigsaw - part_iioi">
- <_description>Jigsaw — part_iioi</_description>
+ <description>Jigsaw — part_iioi</description>
</object>
<object name="Jigsaw - part_iiio">
- <_description>Jigsaw — part_iiio</_description>
+ <description>Jigsaw — part_iiio</description>
</object>
</contents>
</sheet>
diff --git a/sheets/meson.build b/sheets/meson.build
index 48d3ed86..0b7bda57 100644
--- a/sheets/meson.build
+++ b/sheets/meson.build
@@ -42,17 +42,13 @@ sheet_files = [
sheet_files_targets = []
-# TODO: use gettext: https://github.com/mesonbuild/meson/issues/1565
-# https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319
-# https://wiki.gnome.org/MigratingFromIntltoolToGettext
-# https://www.gnu.org/software/gettext/manual/html_node/Preparing-ITS-Rules.html
-# https://www.w3.org/TR/its20/ (2013) standard!
foreach sheet : sheet_files
- sheet_files_targets += custom_target(
+ sheet_files_targets += i18n.merge_file(
sheet,
- input: sheet + '.in',
+ input: sheet,
output: sheet,
- command: intltool_command,
+ po_dir: po_dir,
+ data_dirs: po_dir,
install: true,
install_dir: sheetsdir
)
diff --git a/sheets/network.sheet.in b/sheets/network.sheet
similarity index 54%
rename from sheets/network.sheet.in
rename to sheets/network.sheet
index 7bafcc0e..c70d5a60 100644
--- a/sheets/network.sheet.in
+++ b/sheets/network.sheet
@@ -1,120 +1,120 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Network</_name>
- <_description>Objects to design network diagrams with</_description>
+ <name>Network</name>
+ <description>Objects to design network diagrams with</description>
<contents>
<object name="Network - General Computer (Tower)">
- <_description>Computer</_description>
+ <description>Computer</description>
</object>
<object name="Network - General Monitor (With Stand)">
- <_description>Monitor</_description>
+ <description>Monitor</description>
</object>
<object name="Network - Storage">
- <_description>Storage</_description>
+ <description>Storage</description>
</object>
<object name="Network - Bus">
<!-- very old name kept for compatibility -->
<alias name="Standard - Bus"/>
- <_description>Ethernet bus</_description>
+ <description>Ethernet bus</description>
</object>
<object name="Network - General Printer">
- <_description>Simple printer</_description>
+ <description>Simple printer</description>
</object>
<object name="Network - WAN Connection">
- <_description>WAN connection</_description>
+ <description>WAN connection</description>
</object>
<object name="Network - WAN Link">
- <_description>WAN link</_description>
+ <description>WAN link</description>
</object>
<object name="Network - Hub">
- <_description>Stackable hub or switch</_description>
+ <description>Stackable hub or switch</description>
</object>
<object name="Network - Modular Switch">
- <_description>Modular switching system</_description>
+ <description>Modular switching system</description>
</object>
<object name="Network - Patch Panel">
- <_description>24 Port Patch Panel</_description>
+ <description>24 Port Patch Panel</description>
</object>
<object name="Network - RJ45 Wall-Plug">
- <_description>RJ45 wall-plug</_description>
+ <description>RJ45 wall-plug</description>
</object>
<object name="Network - scEAD Wall-Plug">
- <_description>Wall-plug for the scEAD cabling system</_description>
+ <description>Wall-plug for the scEAD cabling system</description>
</object>
<object name="Network - Modem">
- <_description>Simple modem</_description>
+ <description>Simple modem</description>
</object>
<object name="Network - Antenna">
- <_description>Antenna for wireless transmission</_description>
+ <description>Antenna for wireless transmission</description>
</object>
<object name="Network - Base Station">
- <_description>Mobile telephony base station</_description>
+ <description>Mobile telephony base station</description>
</object>
<object name="Network - Cloud">
- <_description>Network cloud</_description>
+ <description>Network cloud</description>
</object>
<object name="Network - Radio Cell">
- <_description>Mobile telephony cell</_description>
+ <description>Mobile telephony cell</description>
</object>
<object name="Network - Router Symbol">
- <_description>Router symbol</_description>
+ <description>Router symbol</description>
</object>
<object name="Network - Switch Symbol">
- <_description>Switch symbol</_description>
+ <description>Switch symbol</description>
</object>
<object name="Network - Switch ATM Symbol">
- <_description>ATM switch symbol</_description>
+ <description>ATM switch symbol</description>
</object>
<object name="Network - Firewall">
- <_description>Firewall router</_description>
+ <description>Firewall router</description>
</object>
<object name="Network - A Workstation Monitor">
- <_description>Workstation monitor</_description>
+ <description>Workstation monitor</description>
</object>
<object name="Network - A Workstation">
- <_description>UNIX workstation</_description>
+ <description>UNIX workstation</description>
</object>
<object name="Network - A Desktop PC">
- <_description>Desktop PC</_description>
+ <description>Desktop PC</description>
</object>
<object name="Network - Laptop Computer">
- <_description>Laptop PC</_description>
+ <description>Laptop PC</description>
</object>
<object name="Network - A Bigtower PC">
- <_description>Bigtower PC</_description>
+ <description>Bigtower PC</description>
</object>
<object name="Network - A Miditower PC">
- <_description>Miditower PC</_description>
+ <description>Miditower PC</description>
</object>
<object name="Network - A Minitower PC">
- <_description>Minitower PC</_description>
+ <description>Minitower PC</description>
</object>
<object name="Network - An amplifier speaker">
- <_description>Speaker with integrated amplifier</_description>
+ <description>Speaker with integrated amplifier</description>
</object>
<object name="Network - A speaker">
- <_description>Speaker without amplifier</_description>
+ <description>Speaker without amplifier</description>
</object>
<object name="Network - A Diskette">
- <_description>3 1/2 inch diskette</_description>
+ <description>3 1/2 inch diskette</description>
</object>
<object name="Network - A ZIP Disk">
- <_description>ZIP disk</_description>
+ <description>ZIP disk</description>
</object>
<object name="Network - An external DAT drive">
- <_description>External DAT drive</_description>
+ <description>External DAT drive</description>
</object>
<object name="Network - A Mobile Phone">
- <_description>Mobile phone</_description>
+ <description>Mobile phone</description>
</object>
<object name="Network - A Telephone">
- <_description>Telephone</_description>
+ <description>Telephone</description>
</object>
<object name="Network - Plotter">
- <_description>Plotter</_description>
+ <description>Plotter</description>
</object>
<object name="Network - Digitizing Board">
- <_description>Digitizing board</_description>
+ <description>Digitizing board</description>
</object>
</contents>
</sheet>
diff --git a/sheets/sybase.sheet.in b/sheets/sybase.sheet
similarity index 53%
rename from sheets/sybase.sheet.in
rename to sheets/sybase.sheet
index db3c4d9b..2c398a2c 100644
--- a/sheets/sybase.sheet.in
+++ b/sheets/sybase.sheet
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
<sheet xmlns="http://www.lysator.liu.se/~alla/dia/dia-sheet-ns";>
- <_name>Sybase</_name>
- <_description>Objects to design Sybase replication domain diagrams with</_description>
+ <name>Sybase</name>
+ <description>Objects to design Sybase replication domain diagrams with</description>
<contents>
<object name="Sybase - Dataserver">
- <_description>Sybase dataserver</_description>
+ <description>Sybase dataserver</description>
</object>
<object name="Sybase - Replication Server">
- <_description>Sybase replication server</_description>
+ <description>Sybase replication server</description>
</object>
<object name="Sybase - Log Transfer Manager/Rep Agent">
- <_description>Log transfer manager or rep agent</_description>
+ <description>Log transfer manager or rep agent</description>
</object>
<object name="Sybase - Stable Queue">
- <_description>Stable storage device</_description>
+ <description>Stable storage device</description>
</object>
<object name="Sybase - Client Application">
- <_description>Sybase client application</_description>
+ <description>Sybase client application</description>
</object>
<object name="Sybase - Replication Server Manager">
- <_description>Replication server manager</_description>
+ <description>Replication server manager</description>
</object>
</contents>
</sheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
