[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[virt-tools-list] [libosinfo v5 4/4] Mark obvious strings in DB for translation



From: "Zeeshan Ali (Khattak)" <zeeshanak gnome org>

Mark 'name' and 'vendor' in oses and hypervisor, and 'name' in devices
for translation.

This implies that now we generate the actual XML files to automatically
get translations inserted into them.

Note that this break `make syntax-check` because sc_po_check rule in
maint.mk doesn't know how deal with xml.in files and I got a headache
trying to correct this in the magic shell script.
---
 .gitignore                                         |  25 ++++
 cfg.mk                                             |   2 +
 data/devices/Makefile.am                           |  14 +-
 data/devices/{qemu-pci.xml => qemu-pci.xml.in}     |  26 ++--
 data/devices/{qemu-ps2.xml => qemu-ps2.xml.in}     |   4 +-
 data/devices/{qemu-usb.xml => qemu-usb.xml.in}     |   2 +-
 data/devices/{virtio-pci.xml => virtio-pci.xml.in} |  10 +-
 data/devices/{xen.xml => xen.xml.in}               |   0
 data/hypervisors/Makefile.am                       |   8 +-
 data/hypervisors/{rhel-xen.xml => rhel-xen.xml.in} |  32 ++---
 data/hypervisors/{xen.xml => xen.xml.in}           |  76 +++++-----
 data/oses/Makefile.am                              |  46 +++---
 data/oses/{centos.xml => centos.xml.in}            |   8 +-
 data/oses/{debian.xml => debian.xml.in}            |  48 +++----
 data/oses/{dos.xml => dos.xml.in}                  |   4 +-
 data/oses/{fedora.xml => fedora.xml.in}            |  72 +++++-----
 data/oses/{freebsd.xml => freebsd.xml.in}          | 160 ++++++++++-----------
 data/oses/{gnome.xml => gnome.xml.in}              |   4 +-
 data/oses/{macos.xml => macos.xml.in}              |  32 ++---
 data/oses/{mandrake.xml => mandrake.xml.in}        |  68 ++++-----
 data/oses/{mandriva.xml => mandriva.xml.in}        |  52 +++----
 data/oses/{netbsd.xml => netbsd.xml.in}            |  56 ++++----
 data/oses/{netware.xml => netware.xml.in}          |  12 +-
 data/oses/{openbsd.xml => openbsd.xml.in}          |  28 ++--
 data/oses/{opensuse.xml => opensuse.xml.in}        |  32 ++---
 data/oses/{rhel.xml => rhel.xml.in}                | 160 ++++++++++-----------
 data/oses/{rhl.xml => rhl.xml.in}                  |  80 +++++------
 data/oses/{solaris.xml => solaris.xml.in}          |  12 +-
 data/oses/{suse.xml => suse.xml.in}                |  24 ++--
 data/oses/{ubuntu.xml => ubuntu.xml.in}            |  68 ++++-----
 data/oses/{windows.xml => windows.xml.in}          |  80 +++++------
 data/schemas/libosinfo.rng                         |  48 +++++--
 po/POTFILES.in                                     |  25 ++++
 33 files changed, 708 insertions(+), 610 deletions(-)
 rename data/devices/{qemu-pci.xml => qemu-pci.xml.in} (87%)
 rename data/devices/{qemu-ps2.xml => qemu-ps2.xml.in} (86%)
 rename data/devices/{qemu-usb.xml => qemu-usb.xml.in} (90%)
 rename data/devices/{virtio-pci.xml => virtio-pci.xml.in} (88%)
 rename data/devices/{xen.xml => xen.xml.in} (100%)
 rename data/hypervisors/{rhel-xen.xml => rhel-xen.xml.in} (84%)
 rename data/hypervisors/{xen.xml => xen.xml.in} (84%)
 rename data/oses/{centos.xml => centos.xml.in} (88%)
 rename data/oses/{debian.xml => debian.xml.in} (86%)
 rename data/oses/{dos.xml => dos.xml.in} (73%)
 rename data/oses/{fedora.xml => fedora.xml.in} (97%)
 rename data/oses/{freebsd.xml => freebsd.xml.in} (81%)
 rename data/oses/{gnome.xml => gnome.xml.in} (92%)
 rename data/oses/{macos.xml => macos.xml.in} (79%)
 rename data/oses/{mandrake.xml => mandrake.xml.in} (81%)
 rename data/oses/{mandriva.xml => mandriva.xml.in} (80%)
 rename data/oses/{netbsd.xml => netbsd.xml.in} (82%)
 rename data/oses/{netware.xml => netware.xml.in} (73%)
 rename data/oses/{openbsd.xml => openbsd.xml.in} (92%)
 rename data/oses/{opensuse.xml => opensuse.xml.in} (93%)
 rename data/oses/{rhel.xml => rhel.xml.in} (83%)
 rename data/oses/{rhl.xml => rhl.xml.in} (82%)
 rename data/oses/{solaris.xml => solaris.xml.in} (80%)
 rename data/oses/{suse.xml => suse.xml.in} (78%)
 rename data/oses/{ubuntu.xml => ubuntu.xml.in} (96%)
 rename data/oses/{windows.xml => windows.xml.in} (92%)

diff --git a/.gitignore b/.gitignore
index 4383a35..b3ad378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,32 @@ test/test-treeuris
 build/
 gtk-doc.make
 data/95-osinfo.rules
+data/devices/qemu-pci.xml
+data/devices/qemu-ps2.xml
+data/devices/qemu-usb.xml
+data/devices/virtio-pci.xml
+data/devices/xen.xml
+data/hypervisors/rhel-xen.xml
+data/hypervisors/xen.xml
 data/pci.ids
+data/oses/centos.xml
+data/oses/debian.xml
+data/oses/dos.xml
+data/oses/fedora.xml
+data/oses/freebsd.xml
+data/oses/gnome.xml
+data/oses/mandrake.xml
+data/oses/mandriva.xml
+data/oses/netbsd.xml
+data/oses/netware.xml
+data/oses/openbsd.xml
+data/oses/opensuse.xml
+data/oses/rhel.xml
+data/oses/rhl.xml
+data/oses/solaris.xml
+data/oses/suse.xml
+data/oses/ubuntu.xml
+data/oses/windows.xml
 data/usb.ids
 tools/osinfo-detect
 tools/osinfo-detect.1
diff --git a/cfg.mk b/cfg.mk
index 444bfe5..c78b382 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -136,3 +136,5 @@ exclude_file_name_regexp--sc_require_config_h_first = python/libvirt-glib.c
 exclude_file_name_regexp--sc_trailing_blank = ^test/isodata/.*|docs/object-model.fig
 
 exclude_file_name_regexp--sc_bindtextdomain = ^tools/.*.c|test/.*.c
+
+exclude_file_name_regexp--sc_makefile_at_at_check = ^(data/devices/Makefile.am|data/hypervisors/Makefile.am|data/oses/Makefile.am)
diff --git a/data/devices/Makefile.am b/data/devices/Makefile.am
index be6ed76..c53c221 100644
--- a/data/devices/Makefile.am
+++ b/data/devices/Makefile.am
@@ -1,5 +1,15 @@
 
 databasedir = $(pkgdatadir)/db/devices/
-database_DATA = xen.xml qemu-pci.xml qemu-usb.xml qemu-ps2.xml virtio-pci.xml
+database_in_files = 	  \
+	xen.xml.in 	  \
+	qemu-pci.xml.in   \
+	qemu-usb.xml.in   \
+	qemu-ps2.xml.in   \
+	virtio-pci.xml.in
+	$(NULL)
 
-EXTRA_DIST = $(database_DATA)
+database_DATA = $(database_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/devices/qemu-pci.xml b/data/devices/qemu-pci.xml.in
similarity index 87%
rename from data/devices/qemu-pci.xml
rename to data/devices/qemu-pci.xml.in
index b9b21e0..0d0fbc9 100644
--- a/data/devices/qemu-pci.xml
+++ b/data/devices/qemu-pci.xml.in
@@ -7,7 +7,7 @@
     <name>lsi</name>
     <bus-type>pci</bus-type>
     <class>block</class>
-    <vendor>LSI Logic / Symbios Logic</vendor>
+    <_vendor>LSI Logic / Symbios Logic</_vendor>
     <vendor-id>1000</vendor-id>
     <product>53c895a</product>
     <product-id>0012</product-id>
@@ -19,7 +19,7 @@
     <name>vga</name>
     <bus-type>pci</bus-type>
     <class>video</class>
-    <vendor>QEMU</vendor>
+    <_vendor>QEMU</_vendor>
     <vendor-id>1234</vendor-id>
     <product>VGA</product>
     <product-id>1111</product-id>
@@ -29,7 +29,7 @@
     <name>cirrus</name>
     <bus-type>pci</bus-type>
     <class>video</class>
-    <vendor>Cirrus Logic</vendor>
+    <_vendor>Cirrus Logic</_vendor>
     <vendor-id>1013</vendor-id>
     <product>GD 5446</product>
     <product-id>00b8</product-id>
@@ -39,7 +39,7 @@
     <name>vmvga</name>
     <bus-type>pci</bus-type>
     <class>video</class>
-    <vendor>VMWare</vendor>
+    <_vendor>VMWare</_vendor>
     <vendor-id>15ad</vendor-id>
     <product>VGA</product>
     <product-id>0710</product-id>
@@ -49,7 +49,7 @@
     <name>qxl</name>
     <bus-type>pci</bus-type>
     <class>video</class>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <vendor-id>1b36</vendor-id>
     <product>QXL</product>
     <product-id>0100</product-id>
@@ -61,7 +61,7 @@
     <name>ne2k_pci</name>
     <bus-type>pci</bus-type>
     <class>net</class>
-    <vendor>Realtek Semiconductor Co., Ltd.</vendor>
+    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
     <vendor-id>10ec</vendor-id>
     <product>RTL-8029(AS)</product>
     <product-id>8029</product-id>
@@ -71,7 +71,7 @@
     <name>pcnet</name>
     <bus-type>pci</bus-type>
     <class>net</class>
-    <vendor>Advanced Micro Devices [AMD]</vendor>
+    <_vendor>Advanced Micro Devices [AMD]</_vendor>
     <vendor-id>1022</vendor-id>
     <product>79c970 [PCnet32 LANCE]</product>
     <product-id>2000</product-id>
@@ -81,7 +81,7 @@
     <name>rtl8139</name>
     <bus-type>pci</bus-type>
     <class>net</class>
-    <vendor>Realtek Semiconductor Co., Ltd.</vendor>
+    <_vendor>Realtek Semiconductor Co., Ltd.</_vendor>
     <vendor-id>10ec</vendor-id>
     <product>RTL-8139/8139C/8139C+</product>
     <product-id>8139</product-id>
@@ -90,7 +90,7 @@
   <device id="http://pciids.sourceforge.net/v2.2/pci.ids/8086/100e";>
     <name>e1000</name>
     <bus-type>pci</bus-type>
-    <vendor>Intel Corporation</vendor>
+    <_vendor>Intel Corporation</_vendor>
     <vendor-id>8086</vendor-id>
     <product>82540EM Gigabit Ethernet Controller</product>
     <product-id>100e</product-id>
@@ -103,7 +103,7 @@
     <name>es1370</name>
     <bus-type>pci</bus-type>
     <class>audio</class>
-    <vendor>Ensoniq</vendor>
+    <_vendor>Ensoniq</_vendor>
     <vendor-id>1274</vendor-id>
     <product>ES1370 [AudioPCI]</product>
     <product-id>5000</product-id>
@@ -113,7 +113,7 @@
     <name>ac97</name>
     <bus-type>pci</bus-type>
     <class>audio</class>
-    <vendor>Intel Corporation</vendor>
+    <_vendor>Intel Corporation</_vendor>
     <vendor-id>8086</vendor-id>
     <product>82801AA AC'97 Audio Controller</product>
     <product-id>2415</product-id>
@@ -123,7 +123,7 @@
     <name>ich6</name>
     <bus-type>pci</bus-type>
     <class>audio</class>
-    <vendor>Intel Corporation</vendor>
+    <_vendor>Intel Corporation</_vendor>
     <vendor-id>8086</vendor-id>
     <product>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</product>
     <product-id>2668</product-id>
@@ -136,7 +136,7 @@
     <name>6300esb</name>
     <bus-type>pci</bus-type>
     <class>watchdog</class>
-    <vendor>Intel Corporation</vendor>
+    <_vendor>Intel Corporation</_vendor>
     <vendor-id>8086</vendor-id>
     <product>6300ESB Watchdog Timer</product>
     <product-id>25ab</product-id>
diff --git a/data/devices/qemu-ps2.xml b/data/devices/qemu-ps2.xml.in
similarity index 86%
rename from data/devices/qemu-ps2.xml
rename to data/devices/qemu-ps2.xml.in
index 4524b94..2335ac0 100644
--- a/data/devices/qemu-ps2.xml
+++ b/data/devices/qemu-ps2.xml.in
@@ -5,7 +5,7 @@
     <name>keyboard</name>
     <bus-type>ps2</bus-type>
     <class>input</class>
-    <vendor>Qemu/KVM</vendor>
+    <_vendor>Qemu/KVM</_vendor>
     <product>Keyboard</product>
   </device>
 
@@ -13,7 +13,7 @@
     <name>mouse</name>
     <bus-type>ps2</bus-type>
     <class>input</class>
-    <vendor>Qemu/KVM</vendor>
+    <_vendor>Qemu/KVM</_vendor>
     <product>Mouse</product>
   </device>
 
diff --git a/data/devices/qemu-usb.xml b/data/devices/qemu-usb.xml.in
similarity index 90%
rename from data/devices/qemu-usb.xml
rename to data/devices/qemu-usb.xml.in
index 34ca07a..213187f 100644
--- a/data/devices/qemu-usb.xml
+++ b/data/devices/qemu-usb.xml.in
@@ -5,7 +5,7 @@
     <name>tablet</name>
     <bus-type>usb</bus-type>
     <class>input</class>
-    <vendor>VirtualBox</vendor>
+    <_vendor>VirtualBox</_vendor>
     <vendor-id>80ee</vendor-id>
     <product>Tablet</product>
     <product-id>0021</product-id>
diff --git a/data/devices/virtio-pci.xml b/data/devices/virtio-pci.xml.in
similarity index 88%
rename from data/devices/virtio-pci.xml
rename to data/devices/virtio-pci.xml.in
index b9f4804..b5b3948 100644
--- a/data/devices/virtio-pci.xml
+++ b/data/devices/virtio-pci.xml.in
@@ -5,7 +5,7 @@
     <name>virtio-net</name>
     <bus-type>pci</bus-type>
     <class>net</class>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <vendor-id>1af4</vendor-id>
     <product>Virtio network device</product>
     <product-id>1000</product-id>
@@ -15,7 +15,7 @@
     <name>virtio-block</name>
     <bus-type>pci</bus-type>
     <class>block</class>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <vendor-id>1af4</vendor-id>
     <product>Virtio block device</product>
     <product-id>1001</product-id>
@@ -25,7 +25,7 @@
     <name>virtio-balloon</name>
     <bus-type>pci</bus-type>
     <class>memory.balloon</class>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <vendor-id>1af4</vendor-id>
     <product>Virtio memory balloon</product>
     <product-id>1002</product-id>
@@ -35,7 +35,7 @@
     <name>virtio-console</name>
     <bus-type>pci</bus-type>
     <class>console</class>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <vendor-id>1af4</vendor-id>
     <product>Virtio console</product>
     <product-id>1003</product-id>
@@ -45,7 +45,7 @@
     <name>virtio-9p</name>
     <bus-type>pci</bus-type>
     <class>filesystem</class>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <vendor-id>1af4</vendor-id>
     <product>Virtio 9p</product>
     <product-id>1009</product-id>
diff --git a/data/devices/xen.xml b/data/devices/xen.xml.in
similarity index 100%
rename from data/devices/xen.xml
rename to data/devices/xen.xml.in
diff --git a/data/hypervisors/Makefile.am b/data/hypervisors/Makefile.am
index 2d7041a..823da6f 100644
--- a/data/hypervisors/Makefile.am
+++ b/data/hypervisors/Makefile.am
@@ -1,5 +1,11 @@
 
 databasedir = $(pkgdatadir)/db/hypervisors/
-database_DATA = rhel-xen.xml xen.xml
+database_in_files = rhel-xen.xml.in xen.xml.in
+
+database_DATA = $(database_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(database_in_files) $(database_DATA)
 
 EXTRA_DIST = $(database_DATA)
diff --git a/data/hypervisors/rhel-xen.xml b/data/hypervisors/rhel-xen.xml.in
similarity index 84%
rename from data/hypervisors/rhel-xen.xml
rename to data/hypervisors/rhel-xen.xml.in
index e3757a3..a67dc4e 100644
--- a/data/hypervisors/rhel-xen.xml
+++ b/data/hypervisors/rhel-xen.xml.in
@@ -2,8 +2,8 @@
 
   <platform id="http://redhat.com/rhel/5.0/xen/3.0.3";>
     <short-id>xen-3.0.3-rhel-5.0</short-id>
-    <name>Xen 3.0.3 (RHEL 5.0)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.0.3 (RHEL 5.0)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.0.3</version>
 
     <derives-from id="http://xen.org/xen/3.0.3"/>
@@ -18,8 +18,8 @@
 
   <platform id="http://redhat.com/rhel/5.1/xen/3.1.0";>
     <short-id>xen-3.1.0-rhel-5.1</short-id>
-    <name>Xen 3.1.0 (RHEL 5.1)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.1.0 (RHEL 5.1)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.1.0</version>
 
     <derives-from id="http://xen.org/xen/3.1.0"/>
@@ -34,8 +34,8 @@
 
   <platform id="http://redhat.com/rhel/5.2/xen/3.1.0";>
     <short-id>xen-3.1.0-rhel-5.2</short-id>
-    <name>Xen 3.1.0 (RHEL 5.2)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.1.0 (RHEL 5.2)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.1.0</version>
 
     <derives-from id="http://xen.org/xen/3.1.0"/>
@@ -50,8 +50,8 @@
 
   <platform id="http://redhat.com/rhel/5.3/xen/3.1.0";>
     <short-id>xen-3.1.0-rhel-5.3</short-id>
-    <name>Xen 3.1.0 (RHEL 5.3)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.1.0 (RHEL 5.3)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.1.0</version>
 
     <derives-from id="http://xen.org/xen/3.1.0"/>
@@ -66,8 +66,8 @@
 
   <platform id="http://redhat.com/rhel/5.4/xen/3.1.0";>
     <short-id>xen-3.1.0-rhel-5.4</short-id>
-    <name>Xen 3.1.0 (RHEL 5.4)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.1.0 (RHEL 5.4)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.1.0</version>
 
     <derives-from id="http://xen.org/xen/3.1.0"/>
@@ -82,8 +82,8 @@
 
   <platform id="http://redhat.com/rhel/5.5/xen/3.1.0";>
     <short-id>xen-3.1.0-rhel-5.5</short-id>
-    <name>Xen 3.1.0 (RHEL 5.5)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.1.0 (RHEL 5.5)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.1.0</version>
 
     <derives-from id="http://xen.org/xen/3.1.0"/>
@@ -98,8 +98,8 @@
 
   <platform id="http://redhat.com/rhel/5.6/xen/3.1.0";>
     <short-id>xen-3.1.0-rhel-5.6</short-id>
-    <name>Xen 3.1.0 (RHEL 5.6)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.1.0 (RHEL 5.6)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.1.0</version>
 
     <derives-from id="http://xen.org/xen/3.1.0"/>
@@ -114,8 +114,8 @@
 
   <platform id="http://redhat.com/rhel/5.7/xen/3.1.0";>
     <short-id>xen-3.1.0-rhel-5.7</short-id>
-    <name>Xen 3.1.0 (RHEL 5.7)</name>
-    <vendor>Red Hat, Inc.</vendor>
+    <_name>Xen 3.1.0 (RHEL 5.7)</_name>
+    <_vendor>Red Hat, Inc.</_vendor>
     <version>3.1.0</version>
 
     <derives-from id="http://xen.org/xen/3.1.0"/>
diff --git a/data/hypervisors/xen.xml b/data/hypervisors/xen.xml.in
similarity index 84%
rename from data/hypervisors/xen.xml
rename to data/hypervisors/xen.xml.in
index d42c823..98efefb 100644
--- a/data/hypervisors/xen.xml
+++ b/data/hypervisors/xen.xml.in
@@ -3,8 +3,8 @@
 
   <platform id="http://xen.org/xen/3.0.2";>
     <short-id>xen-3.0.2</short-id>
-    <name>Xen 3.0.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.0.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.0.2</version>
 
     <devices>
@@ -16,8 +16,8 @@
 
   <platform id="http://xen.org/xen/3.0.3";>
     <short-id>xen-3.0.3</short-id>
-    <name>Xen 3.0.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.0.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.0.3</version>
     <upgrades id="http://xen.org/xen/3.0.2"/>
 
@@ -30,8 +30,8 @@
 
   <platform id="http://xen.org/xen/3.0.4";>
     <short-id>xen-3.0.4</short-id>
-    <name>Xen 3.0.4</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.0.4</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.0.4</version>
     <upgrades id="http://xen.org/xen/3.0.3"/>
 
@@ -45,8 +45,8 @@
 
   <platform id="http://xen.org/xen/3.1.3";>
     <short-id>xen-3.1.3</short-id>
-    <name>Xen 3.1.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.1.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.1.3</version>
     <upgrades id="http://xen.org/xen/3.0.4"/>
 
@@ -60,8 +60,8 @@
 
   <platform id="http://xen.org/xen/3.1.4";>
     <short-id>xen-3.1.4</short-id>
-    <name>Xen 3.1.4</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.1.4</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.1.4</version>
     <upgrades id="http://xen.org/xen/3.1.3"/>
 
@@ -75,8 +75,8 @@
 
   <platform id="http://xen.org/xen/3.2.0";>
     <short-id>xen-3.2.0</short-id>
-    <name>Xen 3.2.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.2.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.2.0</version>
     <upgrades id="http://xen.org/xen/3.1.4"/>
 
@@ -90,8 +90,8 @@
 
   <platform id="http://xen.org/xen/3.2.1";>
     <short-id>xen-3.2.1</short-id>
-    <name>Xen 3.2.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.2.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.2.1</version>
     <upgrades id="http://xen.org/xen/3.2.0"/>
 
@@ -105,8 +105,8 @@
 
   <platform id="http://xen.org/xen/3.2.2";>
     <short-id>xen-3.2.2</short-id>
-    <name>Xen 3.2.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.2.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.2.2</version>
     <upgrades id="http://xen.org/xen/3.2.1"/>
 
@@ -120,8 +120,8 @@
 
   <platform id="http://xen.org/xen/3.2.3";>
     <short-id>xen-3.2.3</short-id>
-    <name>Xen 3.2.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.2.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.2.3</version>
     <upgrades id="http://xen.org/xen/3.2.2"/>
 
@@ -135,8 +135,8 @@
 
   <platform id="http://xen.org/xen/3.3.0";>
     <short-id>xen-3.3.0</short-id>
-    <name>Xen 3.3.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.3.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.3.0</version>
     <upgrades id="http://xen.org/xen/3.2.3"/>
 
@@ -150,8 +150,8 @@
 
   <platform id="http://xen.org/xen/3.3.1";>
     <short-id>xen-3.3.1</short-id>
-    <name>Xen 3.3.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.3.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.3.1</version>
     <upgrades id="http://xen.org/xen/3.3.0"/>
 
@@ -165,8 +165,8 @@
 
   <platform id="http://xen.org/xen/3.3.2";>
     <short-id>xen-3.3.2</short-id>
-    <name>Xen 3.3.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.3.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.3.2</version>
     <upgrades id="http://xen.org/xen/3.3.1"/>
 
@@ -180,8 +180,8 @@
 
   <platform id="http://xen.org/xen/3.4.0";>
     <short-id>xen-3.4.0</short-id>
-    <name>Xen 3.4.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.4.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.4.0</version>
     <upgrades id="http://xen.org/xen/3.3.2"/>
 
@@ -195,8 +195,8 @@
 
   <platform id="http://xen.org/xen/3.4.1";>
     <short-id>xen-3.4.1</short-id>
-    <name>Xen 3.4.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.4.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.4.1</version>
     <upgrades id="http://xen.org/xen/3.4.0"/>
 
@@ -210,8 +210,8 @@
 
   <platform id="http://xen.org/xen/3.4.2";>
     <short-id>xen-3.4.2</short-id>
-    <name>Xen 3.4.2</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.4.2</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.4.2</version>
     <upgrades id="http://xen.org/xen/3.4.1"/>
 
@@ -225,8 +225,8 @@
 
   <platform id="http://xen.org/xen/3.4.3";>
     <short-id>xen-3.4.3</short-id>
-    <name>Xen 3.4.3</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 3.4.3</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>3.4.3</version>
     <upgrades id="http://xen.org/xen/3.4.2"/>
 
@@ -240,8 +240,8 @@
 
   <platform id="http://xen.org/xen/4.0.0";>
     <short-id>xen-4.0.0</short-id>
-    <name>Xen 4.0.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 4.0.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>4.0.0</version>
     <upgrades id="http://xen.org/xen/3.4.3"/>
 
@@ -255,8 +255,8 @@
 
   <platform id="http://xen.org/xen/4.0.1";>
     <short-id>xen-4.0.1</short-id>
-    <name>Xen 4.0.1</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 4.0.1</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>4.0.1</version>
     <upgrades id="http://xen.org/xen/4.0.0"/>
 
@@ -270,8 +270,8 @@
 
   <platform id="http://xen.org/xen/4.1.0";>
     <short-id>xen-4.1.0</short-id>
-    <name>Xen 4.1.0</name>
-    <vendor>Citrix Systems, Inc.</vendor>
+    <_name>Xen 4.1.0</_name>
+    <_vendor>Citrix Systems, Inc.</_vendor>
     <version>4.1.0</version>
     <upgrades id="http://xen.org/xen/4.0.1"/>
 
diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index fd0b9ae..be492ae 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -1,24 +1,28 @@
 
 databasedir = $(pkgdatadir)/db/oses/
-database_DATA =     \
-  centos.xml        \
-  debian.xml        \
-  dos.xml           \
-  fedora.xml        \
-  freebsd.xml	    \
-  gnome.xml	    \
-  mandriva.xml      \
-  mandrake.xml      \
-  netbsd.xml	    \
-  netware.xml	    \
-  openbsd.xml	    \
-  opensuse.xml      \
-  rhl.xml           \
-  rhel.xml          \
-  solaris.xml	    \
-  suse.xml          \
-  ubuntu.xml        \
-  windows.xml 	    \
-  $(NULL)
+database_in_files = 	\
+	centos.xml.in   \
+	debian.xml.in   \
+	dos.xml.in      \
+	fedora.xml.in   \
+	freebsd.xml.in  \
+	gnome.xml.in	\
+	mandriva.xml.in \
+	mandrake.xml.in \
+	netbsd.xml.in	\
+	netware.xml.in  \
+	openbsd.xml.in  \
+	opensuse.xml.in \
+	rhl.xml.in      \
+	rhel.xml.in     \
+	solaris.xml.in  \
+	suse.xml.in     \
+	ubuntu.xml.in   \
+	windows.xml.in  \
+	$(NULL)
 
-EXTRA_DIST = $(database_DATA)
+database_DATA = $(database_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_RULE@
+
+EXTRA_DIST = $(database_in_files) $(database_DATA)
diff --git a/data/oses/centos.xml b/data/oses/centos.xml.in
similarity index 88%
rename from data/oses/centos.xml
rename to data/oses/centos.xml.in
index 1dfb1c7..03e4b8a 100644
--- a/data/oses/centos.xml
+++ b/data/oses/centos.xml.in
@@ -2,9 +2,9 @@
 
   <os id="http://centos.org/centos/6.0";>
     <short-id>centos6.0</short-id>
-    <name>CentOS 6.0</name>
+    <_name>CentOS 6.0</_name>
     <version>6.0</version>
-    <vendor>CentOS</vendor>
+    <_vendor>CentOS</_vendor>
     <family>linux</family>
     <distro>centos</distro>
     <clones id="http://redhat.com/rhel/6.0"/>
@@ -27,9 +27,9 @@
 
   <os id="http://centos.org/centos/6.1";>
     <short-id>centos6.1</short-id>
-    <name>CentOS 6.1</name>
+    <_name>CentOS 6.1</_name>
     <version>6.1</version>
-    <vendor>CentOS</vendor>
+    <_vendor>CentOS</_vendor>
     <family>linux</family>
     <distro>centos</distro>
     <upgrades id="http://centos.org/centos/6.0"/>
diff --git a/data/oses/debian.xml b/data/oses/debian.xml.in
similarity index 86%
rename from data/oses/debian.xml
rename to data/oses/debian.xml.in
index 675acd2..67f27a9 100644
--- a/data/oses/debian.xml
+++ b/data/oses/debian.xml.in
@@ -3,9 +3,9 @@
   <os id="http://debian.org/debian/1.0";>
     <short-id>debian1.0</short-id>
     <short-id>debianbuzz</short-id>
-    <name>Debian Buzz</name>
+    <_name>Debian Buzz</_name>
     <version>1.1</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
   </os>
@@ -13,9 +13,9 @@
   <os id="http://debian.org/debian/1.2";>
     <short-id>debian1.2</short-id>
     <short-id>debianrex</short-id>
-    <name>Debian Rex</name>
+    <_name>Debian Rex</_name>
     <version>1.2</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/1.0"/>
@@ -25,9 +25,9 @@
   <os id="http://debian.org/debian/1.3";>
     <short-id>debian1.3</short-id>
     <short-id>debianbo</short-id>
-    <name>Debian Bo</name>
+    <_name>Debian Bo</_name>
     <version>1.3</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/1.2"/>
@@ -37,9 +37,9 @@
   <os id="http://debian.org/debian/2.0";>
     <short-id>debian2.0</short-id>
     <short-id>debianhamm</short-id>
-    <name>Debian Hamm</name>
+    <_name>Debian Hamm</_name>
     <version>2.0</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/1.3"/>
@@ -49,9 +49,9 @@
   <os id="http://debian.org/debian/2.1";>
     <short-id>debian2.1</short-id>
     <short-id>debiansilnk</short-id>
-    <name>Debian Silnk</name>
+    <_name>Debian Silnk</_name>
     <version>2.1</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/2.0"/>
@@ -61,9 +61,9 @@
   <os id="http://debian.org/debian/2.2";>
     <short-id>debian2.2</short-id>
     <short-id>debianpotato</short-id>
-    <name>Debian Potato</name>
+    <_name>Debian Potato</_name>
     <version>2.2</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/2.1"/>
@@ -73,9 +73,9 @@
   <os id="http://debian.org/debian/3";>
     <short-id>debian3</short-id>
     <short-id>debianwoody</short-id>
-    <name>Debian Woody</name>
+    <_name>Debian Woody</_name>
     <version>3</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/2.2"/>
@@ -86,9 +86,9 @@
   <os id="http://debian.org/debian/3.1";>
     <short-id>debian3.1</short-id>
     <short-id>debiansarge</short-id>
-    <name>Debian Sarge</name>
+    <_name>Debian Sarge</_name>
     <version>3.1</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/3"/>
@@ -98,9 +98,9 @@
   <os id="http://debian.org/debian/4";>
     <short-id>debian4</short-id>
     <short-id>debianetch</short-id>
-    <name>Debian Etch</name>
+    <_name>Debian Etch</_name>
     <version>4</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/3.1"/>
@@ -110,9 +110,9 @@
   <os id="http://debian.org/debian/5";>
     <short-id>debian5</short-id>
     <short-id>debianlenny</short-id>
-    <name>Debian Lenny</name>
+    <_name>Debian Lenny</_name>
     <version>5</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/4"/>
@@ -141,9 +141,9 @@
   <os id="http://debian.org/debian/6";>
     <short-id>debian6</short-id>
     <short-id>debiansqueeze</short-id>
-    <name>Debian Squeeze</name>
+    <_name>Debian Squeeze</_name>
     <version>6</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/debian/5"/>
@@ -201,9 +201,9 @@
 <!-- Wheezy isn't released yet
   <os id="http://debian.org/wheezy";>
     <short-id>debianwheezy</short-id>
-    <name>Debian Wheezy</name>
+    <_name>Debian Wheezy</_name>
     <version>7</version>
-    <vendor>Debian Project</vendor>
+    <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <upgrades id="http://debian.org/squeeze"/>
   </os>
diff --git a/data/oses/dos.xml b/data/oses/dos.xml.in
similarity index 73%
rename from data/oses/dos.xml
rename to data/oses/dos.xml.in
index 4f26e3f..075ebb4 100644
--- a/data/oses/dos.xml
+++ b/data/oses/dos.xml.in
@@ -1,8 +1,8 @@
 <libosinfo version="0.0.1">
   <os id="http://microsoft.com/msdos/6.22";>
     <short-id>msdos6.22</short-id>
-    <name>Microsoft MS-DOS 6.22</name>
-    <vendor>Microsoft</vendor>
+    <_name>Microsoft MS-DOS 6.22</_name>
+    <_vendor>Microsoft</_vendor>
     <version>6.22</version>
     <family>msdos</family>
     <distro>msdos</distro>
diff --git a/data/oses/fedora.xml b/data/oses/fedora.xml.in
similarity index 97%
rename from data/oses/fedora.xml
rename to data/oses/fedora.xml.in
index 40023c4..0ed21c3 100644
--- a/data/oses/fedora.xml
+++ b/data/oses/fedora.xml.in
@@ -2,9 +2,9 @@
 
   <os id="http://fedoraproject.org/fedora/1";>
     <short-id>fedora1</short-id>
-    <name>Fedora Core 1</name>
+    <_name>Fedora Core 1</_name>
     <version>1</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Yarrow</codename>
@@ -60,9 +60,9 @@
 
   <os id="http://fedoraproject.org/fedora/2";>
     <short-id>fedora2</short-id>
-    <name>Fedora Core 2</name>
+    <_name>Fedora Core 2</_name>
     <version>2</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Tettnang</codename>
@@ -111,9 +111,9 @@
 
   <os id="http://fedoraproject.org/fedora/3";>
     <short-id>fedora3</short-id>
-    <name>Fedora Core 3</name>
+    <_name>Fedora Core 3</_name>
     <version>3</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Heidelberg</codename>
@@ -162,9 +162,9 @@
 
   <os id="http://fedoraproject.org/fedora/4";>
     <short-id>fedora4</short-id>
-    <name>Fedora Core 4</name>
+    <_name>Fedora Core 4</_name>
     <version>4</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Stentz</codename>
@@ -222,9 +222,9 @@
 
   <os id="http://fedoraproject.org/fedora/5";>
     <short-id>fedora5</short-id>
-    <name>Fedora Core 5</name>
+    <_name>Fedora Core 5</_name>
     <version>5</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Bordeaux</codename>
@@ -282,9 +282,9 @@
 
   <os id="http://fedoraproject.org/fedora/6";>
     <short-id>fedora6</short-id>
-    <name>Fedora Core 6</name>
+    <_name>Fedora Core 6</_name>
     <version>6</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Zod</codename>
@@ -342,9 +342,9 @@
 
   <os id="http://fedoraproject.org/fedora/7";>
     <short-id>fedora7</short-id>
-    <name>Fedora 7</name>
+    <_name>Fedora 7</_name>
     <version>7</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Moonshine</codename>
@@ -425,9 +425,9 @@
 
   <os id="http://fedoraproject.org/fedora/8";>
     <short-id>fedora8</short-id>
-    <name>Fedora 8</name>
+    <_name>Fedora 8</_name>
     <version>8</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Werewolf</codename>
@@ -517,9 +517,9 @@
 
   <os id="http://fedoraproject.org/fedora/9";>
     <short-id>fedora9</short-id>
-    <name>Fedora 9</name>
+    <_name>Fedora 9</_name>
     <version>9</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Sulphur</codename>
@@ -608,9 +608,9 @@
 
   <os id="http://fedoraproject.org/fedora/10";>
     <short-id>fedora10</short-id>
-    <name>Fedora 10</name>
+    <_name>Fedora 10</_name>
     <version>10</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Cambridge</codename>
@@ -696,9 +696,9 @@
 
   <os id="http://fedoraproject.org/fedora/11";>
     <short-id>fedora11</short-id>
-    <name>Fedora 11</name>
+    <_name>Fedora 11</_name>
     <version>11</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Leonidas</codename>
@@ -784,9 +784,9 @@
 
   <os id="http://fedoraproject.org/fedora/12";>
     <short-id>fedora12</short-id>
-    <name>Fedora 12</name>
+    <_name>Fedora 12</_name>
     <version>12</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Constantine</codename>
@@ -867,9 +867,9 @@
 
   <os id="http://fedoraproject.org/fedora/13";>
     <short-id>fedora13</short-id>
-    <name>Fedora 13</name>
+    <_name>Fedora 13</_name>
     <version>13</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Goddard</codename>
@@ -941,9 +941,9 @@
 
   <os id="http://fedoraproject.org/fedora/14";>
     <short-id>fedora14</short-id>
-    <name>Fedora 14</name>
+    <_name>Fedora 14</_name>
     <version>14</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Laughlin</codename>
@@ -1029,9 +1029,9 @@
 
   <os id="http://fedoraproject.org/fedora/15";>
     <short-id>fedora15</short-id>
-    <name>Fedora 15</name>
+    <_name>Fedora 15</_name>
     <version>15</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Lovelock</codename>
@@ -1116,9 +1116,9 @@
 
   <os id="http://fedoraproject.org/fedora/16";>
     <short-id>fedora16</short-id>
-    <name>Fedora 16</name>
+    <_name>Fedora 16</_name>
     <version>16</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Verne</codename>
@@ -1203,9 +1203,9 @@
 
   <os id="http://fedoraproject.org/fedora/17";>
     <short-id>fedora17</short-id>
-    <name>Fedora 17</name>
+    <_name>Fedora 17</_name>
     <version>17</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>Beefy Miracle</codename>
@@ -1288,9 +1288,9 @@
 
   <os id="http://fedoraproject.org/fedora/18";>
     <short-id>fedora18</short-id>
-    <name>Fedora 18</name>
+    <_name>Fedora 18</_name>
     <version>18</version>
-    <vendor>Fedora Project</vendor>
+    <_vendor>Fedora Project</_vendor>
     <family>linux</family>
     <distro>fedora</distro>
     <codename>The Spherical Cow</codename>
diff --git a/data/oses/freebsd.xml b/data/oses/freebsd.xml.in
similarity index 81%
rename from data/oses/freebsd.xml
rename to data/oses/freebsd.xml.in
index 3711127..fc9c03b 100644
--- a/data/oses/freebsd.xml
+++ b/data/oses/freebsd.xml.in
@@ -2,9 +2,9 @@
 
   <os id="http://freebsd.org/freebsd/1.0";>
     <short-id>freebsd1.0</short-id>
-    <name>FreeBSD 1.0</name>
+    <_name>FreeBSD 1.0</_name>
     <version>1.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -14,9 +14,9 @@
 
   <os id="http://freebsd.org/freebsd/2.0";>
     <short-id>freebsd2.0</short-id>
-    <name>FreeBSD 2.0</name>
+    <_name>FreeBSD 2.0</_name>
     <version>2.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -29,9 +29,9 @@
 
   <os id="http://freebsd.org/freebsd/2.0.5";>
     <short-id>freebsd2.0.5</short-id>
-    <name>FreeBSD 2.0.5</name>
+    <_name>FreeBSD 2.0.5</_name>
     <version>2.0.5</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -42,9 +42,9 @@
 
   <os id="http://freebsd.org/freebsd/2.2.8";>
     <short-id>freebsd2.2.8</short-id>
-    <name>FreeBSD 2.2.8</name>
+    <_name>FreeBSD 2.2.8</_name>
     <version>2.2.8</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/2.0.5"/>
@@ -54,9 +54,9 @@
 
   <os id="http://freebsd.org/freebsd/2.2.9";>
     <short-id>freebsd2.2.9</short-id>
-    <name>FreeBSD 2.2.9</name>
+    <_name>FreeBSD 2.2.9</_name>
     <version>2.2.9</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
@@ -66,9 +66,9 @@
 
   <os id="http://freebsd.org/freebsd/3.0";>
     <short-id>freebsd3.0</short-id>
-    <name>FreeBSD 3.0</name>
+    <_name>FreeBSD 3.0</_name>
     <version>3.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -81,9 +81,9 @@
 
   <os id="http://freebsd.org/freebsd/3.2";>
     <short-id>freebsd3.2</short-id>
-    <name>FreeBSD 3.2</name>
+    <_name>FreeBSD 3.2</_name>
     <version>3.2</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/3.0"/>
@@ -93,9 +93,9 @@
 
   <os id="http://freebsd.org/freebsd/4.0";>
     <short-id>freebsd4.0</short-id>
-    <name>FreeBSD 4.0</name>
+    <_name>FreeBSD 4.0</_name>
     <version>4.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -108,9 +108,9 @@
 
   <os id="http://freebsd.org/freebsd/4.1";>
     <short-id>freebsd4.1</short-id>
-    <name>FreeBSD 4.1</name>
+    <_name>FreeBSD 4.1</_name>
     <version>4.1</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -121,9 +121,9 @@
 
   <os id="http://freebsd.org/freebsd/4.2";>
     <short-id>freebsd4.2</short-id>
-    <name>FreeBSD 4.2</name>
+    <_name>FreeBSD 4.2</_name>
     <version>4.2</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -134,9 +134,9 @@
 
   <os id="http://freebsd.org/freebsd/4.3";>
     <short-id>freebsd4.3</short-id>
-    <name>FreeBSD 4.3</name>
+    <_name>FreeBSD 4.3</_name>
     <version>4.3</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -147,9 +147,9 @@
 
   <os id="http://freebsd.org/freebsd/4.4";>
     <short-id>freebsd4.4</short-id>
-    <name>FreeBSD 4.4</name>
+    <_name>FreeBSD 4.4</_name>
     <version>4.4</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -160,9 +160,9 @@
 
   <os id="http://freebsd.org/freebsd/4.5";>
     <short-id>freebsd4.5</short-id>
-    <name>FreeBSD 4.5</name>
+    <_name>FreeBSD 4.5</_name>
     <version>4.5</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -173,9 +173,9 @@
 
   <os id="http://freebsd.org/freebsd/4.6";>
     <short-id>freebsd4.6</short-id>
-    <name>FreeBSD 4.6</name>
+    <_name>FreeBSD 4.6</_name>
     <version>4.6</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -186,9 +186,9 @@
 
   <os id="http://freebsd.org/freebsd/4.7";>
     <short-id>freebsd4.7</short-id>
-    <name>FreeBSD 4.7</name>
+    <_name>FreeBSD 4.7</_name>
     <version>4.7</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -199,9 +199,9 @@
 
   <os id="http://freebsd.org/freebsd/4.8";>
     <short-id>freebsd4.8</short-id>
-    <name>FreeBSD 4.8</name>
+    <_name>FreeBSD 4.8</_name>
     <version>4.8</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -212,9 +212,9 @@
 
   <os id="http://freebsd.org/freebsd/4.9";>
     <short-id>freebsd4.9</short-id>
-    <name>FreeBSD 4.9</name>
+    <_name>FreeBSD 4.9</_name>
     <version>4.9</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -225,9 +225,9 @@
 
   <os id="http://freebsd.org/freebsd/4.10";>
     <short-id>freebsd4.10</short-id>
-    <name>FreeBSD 4.10</name>
+    <_name>FreeBSD 4.10</_name>
     <version>4.10</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -238,9 +238,9 @@
 
   <os id="http://freebsd.org/freebsd/4.11";>
     <short-id>freebsd4.11</short-id>
-    <name>FreeBSD 4.11</name>
+    <_name>FreeBSD 4.11</_name>
     <version>4.11</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -254,9 +254,9 @@
 
   <os id="http://freebsd.org/freebsd/5.0";>
     <short-id>freebsd5.0</short-id>
-    <name>FreeBSD 5.0</name>
+    <_name>FreeBSD 5.0</_name>
     <version>5.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -269,9 +269,9 @@
 
   <os id="http://freebsd.org/freebsd/5.1";>
     <short-id>freebsd5.1</short-id>
-    <name>FreeBSD 5.1</name>
+    <_name>FreeBSD 5.1</_name>
     <version>5.1</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -282,9 +282,9 @@
 
   <os id="http://freebsd.org/freebsd/5.2";>
     <short-id>freebsd5.2</short-id>
-    <name>FreeBSD 5.2</name>
+    <_name>FreeBSD 5.2</_name>
     <version>5.2</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -295,9 +295,9 @@
 
   <os id="http://freebsd.org/freebsd/5.2.1";>
     <short-id>freebsd5.2.1</short-id>
-    <name>FreeBSD 5.2.1</name>
+    <_name>FreeBSD 5.2.1</_name>
     <version>5.2.1</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -308,9 +308,9 @@
 
   <os id="http://freebsd.org/freebsd/5.3";>
     <short-id>freebsd5.3</short-id>
-    <name>FreeBSD 5.3</name>
+    <_name>FreeBSD 5.3</_name>
     <version>5.3</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -321,9 +321,9 @@
 
   <os id="http://freebsd.org/freebsd/5.4";>
     <short-id>freebsd5.4</short-id>
-    <name>FreeBSD 5.4</name>
+    <_name>FreeBSD 5.4</_name>
     <version>5.4</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -334,9 +334,9 @@
 
   <os id="http://freebsd.org/freebsd/5.5";>
     <short-id>freebsd5.5</short-id>
-    <name>FreeBSD 5.5</name>
+    <_name>FreeBSD 5.5</_name>
     <version>5.5</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
 
@@ -349,9 +349,9 @@
 
   <os id="http://freebsd.org/freebsd/6.0";>
     <short-id>freebsd6.0</short-id>
-    <name>FreeBSD 6.0</name>
+    <_name>FreeBSD 6.0</_name>
     <version>6.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/5.5"/>
@@ -366,9 +366,9 @@
 
   <os id="http://freebsd.org/freebsd/6.1";>
     <short-id>freebsd6.1</short-id>
-    <name>FreeBSD 6.1</name>
+    <_name>FreeBSD 6.1</_name>
     <version>6.1</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.0"/>
@@ -377,9 +377,9 @@
 
   <os id="http://freebsd.org/freebsd/6.2";>
     <short-id>freebsd6.2</short-id>
-    <name>FreeBSD 6.2</name>
+    <_name>FreeBSD 6.2</_name>
     <version>6.2</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.1"/>
@@ -388,9 +388,9 @@
 
   <os id="http://freebsd.org/freebsd/6.3";>
     <short-id>freebsd6.3</short-id>
-    <name>FreeBSD 6.3</name>
+    <_name>FreeBSD 6.3</_name>
     <version>6.3</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.2"/>
@@ -399,9 +399,9 @@
 
   <os id="http://freebsd.org/freebsd/6.4";>
     <short-id>freebsd6.4</short-id>
-    <name>FreeBSD 6.4</name>
+    <_name>FreeBSD 6.4</_name>
     <version>6.4</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.3"/>
@@ -412,9 +412,9 @@
 
   <os id="http://freebsd.org/freebsd/7.0";>
     <short-id>freebsd7.0</short-id>
-    <name>FreeBSD 7.0</name>
+    <_name>FreeBSD 7.0</_name>
     <version>7.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.4"/>
@@ -423,9 +423,9 @@
 
   <os id="http://freebsd.org/freebsd/7.1";>
     <short-id>freebsd7.1</short-id>
-    <name>FreeBSD 7.1</name>
+    <_name>FreeBSD 7.1</_name>
     <version>7.1</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.0"/>
@@ -434,9 +434,9 @@
 
   <os id="http://freebsd.org/freebsd/7.2";>
     <short-id>freebsd7.2</short-id>
-    <name>FreeBSD 7.2</name>
+    <_name>FreeBSD 7.2</_name>
     <version>7.2</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.1"/>
@@ -445,9 +445,9 @@
 
   <os id="http://freebsd.org/freebsd/7.3";>
     <short-id>freebsd7.3</short-id>
-    <name>FreeBSD 7.3</name>
+    <_name>FreeBSD 7.3</_name>
     <version>7.3</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.2"/>
@@ -456,9 +456,9 @@
 
   <os id="http://freebsd.org/freebsd/7.4";>
     <short-id>freebsd7.4</short-id>
-    <name>FreeBSD 7.4</name>
+    <_name>FreeBSD 7.4</_name>
     <version>7.4</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.3"/>
@@ -467,9 +467,9 @@
 
   <os id="http://freebsd.org/freebsd/8.0";>
     <short-id>freebsd8.0</short-id>
-    <name>FreeBSD 8.0</name>
+    <_name>FreeBSD 8.0</_name>
     <version>8.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.4"/>
@@ -484,9 +484,9 @@
 
   <os id="http://freebsd.org/freebsd/8.1";>
     <short-id>freebsd8.1</short-id>
-    <name>FreeBSD 8.1</name>
+    <_name>FreeBSD 8.1</_name>
     <version>8.1</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/8.0"/>
@@ -495,9 +495,9 @@
 
   <os id="http://freebsd.org/freebsd/8.2";>
     <short-id>freebsd8.2</short-id>
-    <name>FreeBSD 8.2</name>
+    <_name>FreeBSD 8.2</_name>
     <version>8.2</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/8.1"/>
@@ -506,9 +506,9 @@
 
   <os id="http://freebsd.org/freebsd/9.0";>
     <short-id>freebsd9.0</short-id>
-    <name>FreeBSD 9.0</name>
+    <_name>FreeBSD 9.0</_name>
     <version>9.0</version>
-    <vendor>FreeBSD Project</vendor>
+    <_vendor>FreeBSD Project</_vendor>
     <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/8.2"/>
diff --git a/data/oses/gnome.xml b/data/oses/gnome.xml.in
similarity index 92%
rename from data/oses/gnome.xml
rename to data/oses/gnome.xml.in
index ac161f9..2200aa7 100644
--- a/data/oses/gnome.xml
+++ b/data/oses/gnome.xml.in
@@ -2,9 +2,9 @@
 
   <os id="http://gnome.org/3.6";>
     <short-id>gnome3.6</short-id>
-    <name>GNOME 3.6</name>
+    <_name>GNOME 3.6</_name>
     <version>3.6</version>
-    <vendor>GNOME Project</vendor>
+    <_vendor>GNOME Project</_vendor>
     <family>linux</family>
     <distro>gnome</distro>
     <derives-from id="http://fedoraproject.org/fedora/18"/>
diff --git a/data/oses/macos.xml b/data/oses/macos.xml.in
similarity index 79%
rename from data/oses/macos.xml
rename to data/oses/macos.xml.in
index 012348d..9ec868c 100644
--- a/data/oses/macos.xml
+++ b/data/oses/macos.xml.in
@@ -2,18 +2,18 @@
 
   <os id="http://apple.com/macosx/10.0";>
     <short-id>macosx10.0</short-id>
-    <name>MacOS X Cheetah</name>
+    <_name>MacOS X Cheetah</_name>
     <version>10.0</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
   </os>
 
   <os id="http://apple.com/macosx/10.1";>
     <short-id>macosx10.1</short-id>
-    <name>MacOS X Puma</name>
+    <_name>MacOS X Puma</_name>
     <version>10.1</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.0"; />
@@ -21,9 +21,9 @@
 
   <os id="http://apple.com/macosx/10.2";>
     <short-id>macosx10.2</short-id>
-    <name>MacOS X Jaghuar</name>
+    <_name>MacOS X Jaghuar</_name>
     <version>10.2</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.1"; />
@@ -31,9 +31,9 @@
 
   <os id="http://apple.com/macosx/10.3";>
     <short-id>macosx10.3</short-id>
-    <name>MacOS X Panther</name>
+    <_name>MacOS X Panther</_name>
     <version>10.3</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.2"; />
@@ -41,9 +41,9 @@
 
   <os id="http://apple.com/macosx/10.4";>
     <short-id>macosx10.4</short-id>
-    <name>MacOS X Tiger</name>
+    <_name>MacOS X Tiger</_name>
     <version>10.4</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.3"; />
@@ -51,9 +51,9 @@
 
   <os id="http://apple.com/macosx/10.5";>
     <short-id>macosx10.5</short-id>
-    <name>MacOS X Leopard</name>
+    <_name>MacOS X Leopard</_name>
     <version>10.5</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.4"; />
@@ -61,9 +61,9 @@
 
   <os id="http://apple.com/macosx/10.6";>
     <short-id>macosx10.6</short-id>
-    <name>MacOS X Snow Leopard</name>
+    <_name>MacOS X Snow Leopard</_name>
     <version>10.6</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.5"; />
@@ -81,9 +81,9 @@
 
   <os id="http://apple.com/macosx/10.7";>
     <short-id>macosx10.7</short-id>
-    <name>MacOS X Lion</name>
+    <_name>MacOS X Lion</_name>
     <version>10.7</version>
-    <vendor>Apple Inc.</vendor>
+    <_vendor>Apple Inc.</_vendor>
     <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.6"; />
diff --git a/data/oses/mandrake.xml b/data/oses/mandrake.xml.in
similarity index 81%
rename from data/oses/mandrake.xml
rename to data/oses/mandrake.xml.in
index 294e265..71a65ca 100644
--- a/data/oses/mandrake.xml
+++ b/data/oses/mandrake.xml.in
@@ -2,8 +2,8 @@
 
   <os id="http://mandriva.com/mandrake/5.1";>
     <short-id>mandrake5.1</short-id>
-    <name>Mandrake Linux 5.1</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 5.1</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Venice</codename>
@@ -12,8 +12,8 @@
 
   <os id="http://mandriva.com/mandrake/5.2";>
     <short-id>mandrake5.2</short-id>
-    <name>Mandrake Linux 5.2</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 5.2</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Leeloo</codename>
@@ -25,8 +25,8 @@
 
   <os id="http://mandriva.com/mandrake/5.3";>
     <short-id>mandrake5.3</short-id>
-    <name>Mandrake Linux 5.3</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 5.3</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Festen</codename>
@@ -38,8 +38,8 @@
 
   <os id="http://mandriva.com/mandrake/6.0";>
     <short-id>mandrake6.0</short-id>
-    <name>Mandrake Linux 6.0</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 6.0</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Venus</codename>
@@ -51,8 +51,8 @@
 
   <os id="http://mandriva.com/mandrake/6.1";>
     <short-id>mandrake6.1</short-id>
-    <name>Mandrake Linux 6.1</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 6.1</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Helios</codename>
@@ -64,8 +64,8 @@
 
   <os id="http://mandriva.com/mandrake/7.0";>
     <short-id>mandrake7.0</short-id>
-    <name>Mandrake Linux 7.0</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 7.0</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Air</codename>
@@ -77,8 +77,8 @@
 
   <os id="http://mandriva.com/mandrake/7.1";>
     <short-id>mandrake7.1</short-id>
-    <name>Mandrake Linux 7.1</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 7.1</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Helium</codename>
@@ -90,8 +90,8 @@
 
   <os id="http://mandriva.com/mandrake/7.2";>
     <short-id>mandrake7.2</short-id>
-    <name>Mandrake Linux 7.2</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 7.2</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Odyssey</codename>
@@ -103,8 +103,8 @@
 
   <os id="http://mandriva.com/mandrake/8.0";>
     <short-id>mandrake8.0</short-id>
-    <name>Mandrake Linux 8.0</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 8.0</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Traktopel</codename>
@@ -116,8 +116,8 @@
 
   <os id="http://mandriva.com/mandrake/8.1";>
     <short-id>mandrake8.1</short-id>
-    <name>Mandrake Linux 8.1</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 8.1</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Vitamin</codename>
@@ -129,8 +129,8 @@
 
   <os id="http://mandriva.com/mandrake/8.2";>
     <short-id>mandrake8.2</short-id>
-    <name>Mandrake Linux 8.2</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 8.2</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Bluebird</codename>
@@ -142,8 +142,8 @@
 
   <os id="http://mandriva.com/mandrake/9.0";>
     <short-id>mandrake9.0</short-id>
-    <name>Mandrake Linux 9.0</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 9.0</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Dolphin</codename>
@@ -155,8 +155,8 @@
 
   <os id="http://mandriva.com/mandrake/9.1";>
     <short-id>mandrake9.1</short-id>
-    <name>Mandrake Linux 9.1</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 9.1</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Bamboo</codename>
@@ -168,8 +168,8 @@
 
   <os id="http://mandriva.com/mandrake/9.2";>
     <short-id>mandrake9.2</short-id>
-    <name>Mandrake Linux 9.2</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 9.2</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>FiveStar</codename>
@@ -181,8 +181,8 @@
 
   <os id="http://mandriva.com/mandrake/10.0";>
     <short-id>mandrake10.0</short-id>
-    <name>Mandrake Linux 10.0</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 10.0</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <version>10.0</version>
@@ -193,8 +193,8 @@
 
   <os id="http://mandriva.com/mandrake/10.1";>
     <short-id>mandrake10.1</short-id>
-    <name>Mandrake Linux 10.1</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 10.1</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <version>10.1</version>
@@ -205,8 +205,8 @@
 
   <os id="http://mandriva.com/mandrake/10.2";>
     <short-id>mandrake10.2</short-id>
-    <name>Mandrake Linux 10.2</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandrake Linux 10.2</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandrake</distro>
     <codename>Leeloo</codename>
diff --git a/data/oses/mandriva.xml b/data/oses/mandriva.xml.in
similarity index 80%
rename from data/oses/mandriva.xml
rename to data/oses/mandriva.xml.in
index 53fef7d..cda80f8 100644
--- a/data/oses/mandriva.xml
+++ b/data/oses/mandriva.xml.in
@@ -2,8 +2,8 @@
 
   <os id="http://mandriva.com/mandriva/2006.0";>
     <short-id>mandriva2006.0</short-id>
-    <name>Mandriva Linux 2006.0</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2006.0</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2006.0</version>
@@ -14,8 +14,8 @@
 
   <os id="http://mandriva.com/mandriva/2007";>
     <short-id>mandriva2007</short-id>
-    <name>Mandriva Linux 2007</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2007</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2007</version>
@@ -26,8 +26,8 @@
 
   <os id="http://mandriva.com/mandriva/2007.1";>
     <short-id>mandriva2007.1</short-id>
-    <name>Mandriva Linux 2007 Spring</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2007 Spring</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2007.1</version>
@@ -38,8 +38,8 @@
 
   <os id="http://mandriva.com/mandriva/2008.0";>
     <short-id>mandriva2008.0</short-id>
-    <name>Mandriva Linux 2008</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2008</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2008.0</version>
@@ -50,8 +50,8 @@
 
   <os id="http://mandriva.com/mandriva/2008.1";>
     <short-id>mandriva2008.1</short-id>
-    <name>Mandriva Linux 2008 Spring</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2008 Spring</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2008.1</version>
@@ -62,8 +62,8 @@
 
   <os id="http://mandriva.com/mandriva/2009.0";>
     <short-id>mandriva2009.0</short-id>
-    <name>Mandriva Linux 2009</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2009</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2009.0</version>
@@ -74,8 +74,8 @@
 
   <os id="http://mandriva.com/mandriva/2009.1";>
     <short-id>mandriva2009.1</short-id>
-    <name>Mandriva Linux 2009 Spring</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2009 Spring</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2009.1</version>
@@ -86,8 +86,8 @@
 
   <os id="http://mandriva.com/mandriva/2010.0";>
     <short-id>mandriva2010.0</short-id>
-    <name>Mandriva Linux 2010</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2010</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2010.0</version>
@@ -102,8 +102,8 @@
 
   <os id="http://mandriva.com/mandriva/2010.1";>
     <short-id>mandriva2010.1</short-id>
-    <name>Mandriva Linux 2010 Spring</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2010 Spring</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2010.1</version>
@@ -114,8 +114,8 @@
 
   <os id="http://mandriva.com/mandriva/2010.2";>
     <short-id>mandriva2010.2</short-id>
-    <name>Mandriva Linux 2010.2</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2010.2</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <version>2010.2</version>
@@ -126,8 +126,8 @@
 
   <os id="http://mandriva.com/mandriva/2011";>
     <short-id>mandriva2011</short-id>
-    <name>Mandriva Linux 2011</name>
-    <vendor>Mandriva</vendor>
+    <_name>Mandriva Linux 2011</_name>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mandriva</distro>
     <codename>Hydrogen</codename>
@@ -139,9 +139,9 @@
 
   <os id="http://mandriva.com/mes/5.0";>
     <short-id>mes5</short-id>
-    <name>Mandriva Enterprise Server 5.0</name>
+    <_name>Mandriva Enterprise Server 5.0</_name>
     <version>5.0</version>
-    <vendor>Mandriva</vendor>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mes</distro>
 
@@ -149,9 +149,9 @@
 
   <os id="http://mandriva.com/mes/5.1";>
     <short-id>mes5.1</short-id>
-    <name>Mandriva Enterprise Server 5.1</name>
+    <_name>Mandriva Enterprise Server 5.1</_name>
     <version>5.1</version>
-    <vendor>Mandriva</vendor>
+    <_vendor>Mandriva</_vendor>
     <family>linux</family>
     <distro>mes</distro>
     <upgrades id="http://mandriva.com/mes/5.0"/>
diff --git a/data/oses/netbsd.xml b/data/oses/netbsd.xml.in
similarity index 82%
rename from data/oses/netbsd.xml
rename to data/oses/netbsd.xml.in
index b755b72..fcdc801 100644
--- a/data/oses/netbsd.xml
+++ b/data/oses/netbsd.xml.in
@@ -2,9 +2,9 @@
 
   <os id="http://netbsd.org/netbsd/0.8";>
     <short-id>netbsd0.8</short-id>
-    <name>NetBSD 0.8</name>
+    <_name>NetBSD 0.8</_name>
     <version>0.8</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
 
@@ -13,9 +13,9 @@
 
   <os id="http://netbsd.org/netbsd/0.9";>
     <short-id>netbsd0.9</short-id>
-    <name>NetBSD 0.9</name>
+    <_name>NetBSD 0.9</_name>
     <version>0.9</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/0.8"/>
@@ -26,9 +26,9 @@
 
   <os id="http://netbsd.org/netbsd/1.0";>
     <short-id>netbsd1.0</short-id>
-    <name>NetBSD 1.0</name>
+    <_name>NetBSD 1.0</_name>
     <version>1.0</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/0.9"/>
@@ -39,9 +39,9 @@
 
   <os id="http://netbsd.org/netbsd/1.1";>
     <short-id>netbsd1.1</short-id>
-    <name>NetBSD 1.1</name>
+    <_name>NetBSD 1.1</_name>
     <version>1.1</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.0"/>
@@ -52,9 +52,9 @@
 
   <os id="http://netbsd.org/netbsd/1.2";>
     <short-id>netbsd1.2</short-id>
-    <name>NetBSD 1.2</name>
+    <_name>NetBSD 1.2</_name>
     <version>1.2</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.1"/>
@@ -65,9 +65,9 @@
 
   <os id="http://netbsd.org/netbsd/1.3";>
     <short-id>netbsd1.3</short-id>
-    <name>NetBSD 1.3</name>
+    <_name>NetBSD 1.3</_name>
     <version>1.3</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.2"/>
@@ -78,9 +78,9 @@
 
   <os id="http://netbsd.org/netbsd/1.4";>
     <short-id>netbsd1.4</short-id>
-    <name>NetBSD 1.4</name>
+    <_name>NetBSD 1.4</_name>
     <version>1.4</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.3"/>
@@ -91,9 +91,9 @@
 
   <os id="http://netbsd.org/netbsd/1.5";>
     <short-id>netbsd1.5</short-id>
-    <name>NetBSD 1.5</name>
+    <_name>NetBSD 1.5</_name>
     <version>1.5</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.4"/>
@@ -104,9 +104,9 @@
 
   <os id="http://netbsd.org/netbsd/1.6";>
     <short-id>netbsd1.6</short-id>
-    <name>NetBSD 1.6</name>
+    <_name>NetBSD 1.6</_name>
     <version>1.6</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.5"/>
@@ -117,9 +117,9 @@
 
   <os id="http://netbsd.org/netbsd/2.0";>
     <short-id>netbsd2.0</short-id>
-    <name>NetBSD 2.0</name>
+    <_name>NetBSD 2.0</_name>
     <version>2.0</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.6"/>
@@ -130,9 +130,9 @@
 
   <os id="http://netbsd.org/netbsd/3.0";>
     <short-id>netbsd3.0</short-id>
-    <name>NetBSD 3.0</name>
+    <_name>NetBSD 3.0</_name>
     <version>3.0</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/2.0"/>
@@ -143,9 +143,9 @@
 
   <os id="http://netbsd.org/netbsd/4.0";>
     <short-id>netbsd4.0</short-id>
-    <name>NetBSD 4.0</name>
+    <_name>NetBSD 4.0</_name>
     <version>4.0</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/3.0"/>
@@ -156,9 +156,9 @@
 
   <os id="http://netbsd.org/netbsd/5.0";>
     <short-id>netbsd5.0</short-id>
-    <name>NetBSD 5.0</name>
+    <_name>NetBSD 5.0</_name>
     <version>5.0</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/4.0"/>
@@ -169,9 +169,9 @@
 
   <os id="http://netbsd.org/netbsd/5.1";>
     <short-id>netbsd5.1</short-id>
-    <name>NetBSD 5.1</name>
+    <_name>NetBSD 5.1</_name>
     <version>5.1</version>
-    <vendor>NetBSD Project</vendor>
+    <_vendor>NetBSD Project</_vendor>
     <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/5.0"/>
diff --git a/data/oses/netware.xml b/data/oses/netware.xml.in
similarity index 73%
rename from data/oses/netware.xml
rename to data/oses/netware.xml.in
index a90409e..7fd984c 100644
--- a/data/oses/netware.xml
+++ b/data/oses/netware.xml.in
@@ -1,8 +1,8 @@
 <libosinfo version="0.0.1">
   <os id="http://novell.com/netware4";>
     <short-id>netware4</short-id>
-    <name>Novell Netware 4</name>
-    <vendor>Novell</vendor>
+    <_name>Novell Netware 4</_name>
+    <_vendor>Novell</_vendor>
     <family>netware</family>
     <distro>netware</distro>
     <version>4</version>
@@ -10,8 +10,8 @@
 
   <os id="http://novell.com/netware5";>
     <short-id>netware5</short-id>
-    <name>Novell Netware 5</name>
-    <vendor>Novell</vendor>
+    <_name>Novell Netware 5</_name>
+    <_vendor>Novell</_vendor>
     <family>netware</family>
     <distro>netware</distro>
     <version>5</version>
@@ -19,8 +19,8 @@
 
   <os id="http://novell.com/netware6";>
     <short-id>netware6</short-id>
-    <name>Novell Netware 6</name>
-    <vendor>Novell</vendor>
+    <_name>Novell Netware 6</_name>
+    <_vendor>Novell</_vendor>
     <family>netware</family>
     <distro>netware</distro>
     <version>6</version>
diff --git a/data/oses/openbsd.xml b/data/oses/openbsd.xml.in
similarity index 92%
rename from data/oses/openbsd.xml
rename to data/oses/openbsd.xml.in
index 5c585be..c84ec8f 100644
--- a/data/oses/openbsd.xml
+++ b/data/oses/openbsd.xml.in
@@ -2,11 +2,11 @@
 
   <os id="http://openbsd.org/openbsd/4.2";>
     <short-id>openbsd4.2</short-id>
-    <name>OpenBSD 4.2</name>
+    <_name>OpenBSD 4.2</_name>
     <version>4.2</version>
     <family>openbsd</family>
     <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
+    <_vendor>OpenBSD Project</_vendor>
 
     <media arch='i386'>
       <iso>
@@ -29,11 +29,11 @@
 
   <os id="http://openbsd.org/openbsd/4.3";>
     <short-id>openbsd4.3</short-id>
-    <name>OpenBSD 4.3</name>
+    <_name>OpenBSD 4.3</_name>
     <version>4.3</version>
     <family>openbsd</family>
     <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
+    <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/4.2'/>
     <derives-from id='http://openbsd.org/openbsd/4.2'/>
 
@@ -58,11 +58,11 @@
 
   <os id="http://openbsd.org/openbsd/4.4";>
     <short-id>openbsd4.4</short-id>
-    <name>OpenBSD 4.4</name>
+    <_name>OpenBSD 4.4</_name>
     <version>4.4</version>
     <family>openbsd</family>
     <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
+    <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/4.3'/>
     <derives-from id='http://openbsd.org/openbsd/4.3'/>
 
@@ -87,11 +87,11 @@
 
   <os id="http://openbsd.org/openbsd/4.5";>
     <short-id>openbsd4.5</short-id>
-    <name>OpenBSD 4.5</name>
+    <_name>OpenBSD 4.5</_name>
     <version>4.5</version>
     <family>openbsd</family>
     <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
+    <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/4.4'/>
     <derives-from id='http://openbsd.org/openbsd/4.4'/>
 
@@ -116,11 +116,11 @@
 
   <os id="http://openbsd.org/openbsd/4.8";>
     <short-id>openbsd4.8</short-id>
-    <name>OpenBSD 4.8</name>
+    <_name>OpenBSD 4.8</_name>
     <version>4.8</version>
     <family>openbsd</family>
     <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
+    <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/4.5'/>
     <derives-from id='http://openbsd.org/openbsd/4.5'/>
 
@@ -145,11 +145,11 @@
 
   <os id="http://openbsd.org/openbsd/4.9";>
     <short-id>openbsd4.9</short-id>
-    <name>OpenBSD 4.9</name>
+    <_name>OpenBSD 4.9</_name>
     <version>4.9</version>
     <family>openbsd</family>
     <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
+    <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/4.8'/>
     <derives-from id='http://openbsd.org/openbsd/4.8'/>
 
@@ -179,11 +179,11 @@
 
   <os id="http://openbsd.org/openbsd/5.0";>
     <short-id>openbsd5.0</short-id>
-    <name>OpenBSD 5.0</name>
+    <_name>OpenBSD 5.0</_name>
     <version>5.0</version>
     <family>openbsd</family>
     <distro>openbsd</distro>
-    <vendor>OpenBSD Project</vendor>
+    <_vendor>OpenBSD Project</_vendor>
     <upgrades id='http://openbsd.org/openbsd/4.9'/>
     <derives-from id='http://openbsd.org/openbsd/4.9'/>
 
diff --git a/data/oses/opensuse.xml b/data/oses/opensuse.xml.in
similarity index 93%
rename from data/oses/opensuse.xml
rename to data/oses/opensuse.xml.in
index 85c656f..96ef638 100644
--- a/data/oses/opensuse.xml
+++ b/data/oses/opensuse.xml.in
@@ -2,18 +2,18 @@
 
   <os id="http://opensuse.org/opensuse/10.2";>
     <short-id>opensuse10.2</short-id>
-    <name>openSUSE 10.2</name>
+    <_name>openSUSE 10.2</_name>
     <version>10.2</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
   </os>
 
   <os id="http://opensuse.org/opensuse/10.3";>
     <short-id>opensuse10.3</short-id>
-    <name>openSUSE 10.3</name>
+    <_name>openSUSE 10.3</_name>
     <version>10.3</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/opensuse/10.2"; />
@@ -22,9 +22,9 @@
 
   <os id="http://opensuse.org/opensuse/11.0";>
     <short-id>opensuse11.0</short-id>
-    <name>openSUSE 11.0</name>
+    <_name>openSUSE 11.0</_name>
     <version>11.0</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/opensuse/10.3"; />
@@ -33,9 +33,9 @@
 
   <os id="http://opensuse.org/opensuse/11.1";>
     <short-id>opensuse11.1</short-id>
-    <name>openSUSE 11.1</name>
+    <_name>openSUSE 11.1</_name>
     <version>11.1</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/opensuse/11.0"; />
@@ -44,9 +44,9 @@
 
   <os id="http://opensuse.org/opensuse/11.2";>
     <short-id>opensuse11.2</short-id>
-    <name>openSUSE 11.2</name>
+    <_name>openSUSE 11.2</_name>
     <version>11.2</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/opensuse/11.1"; />
@@ -55,9 +55,9 @@
 
   <os id="http://opensuse.org/opensuse/11.3";>
     <short-id>opensuse11.3</short-id>
-    <name>openSUSE 11.3</name>
+    <_name>openSUSE 11.3</_name>
     <version>11.3</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/opensuse/11.2"; />
@@ -121,9 +121,9 @@
 
   <os id="http://opensuse.org/opensuse/11.4";>
     <short-id>opensuse11.4</short-id>
-    <name>openSUSE 11.4</name>
+    <_name>openSUSE 11.4</_name>
     <version>11.4</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/opensuse/11.3"; />
@@ -179,9 +179,9 @@
 
   <os id="http://opensuse.org/opensuse/12.1";>
     <short-id>opensuse12.1</short-id>
-    <name>openSUSE 12.1</name>
+    <_name>openSUSE 12.1</_name>
     <version>12.1</version>
-    <vendor>openSUSE</vendor>
+    <_vendor>openSUSE</_vendor>
     <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/opensuse/11.4"; />
diff --git a/data/oses/rhel.xml b/data/oses/rhel.xml.in
similarity index 83%
rename from data/oses/rhel.xml
rename to data/oses/rhel.xml.in
index 14414a8..0d2a057 100644
--- a/data/oses/rhel.xml
+++ b/data/oses/rhel.xml.in
@@ -4,9 +4,9 @@
 
   <os id="http://redhat.com/rhel/2.1";>
     <short-id>rhel2.1</short-id>
-    <name>Red Hat Enterprise Linux 2.1</name>
+    <_name>Red Hat Enterprise Linux 2.1</_name>
     <version>2.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -17,9 +17,9 @@
 
   <os id="http://redhat.com/rhel/2.1.1";>
     <short-id>rhel2.1.1</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 1</name>
+    <_name>Red Hat Enterprise Linux 2.1 Update 1</_name>
     <version>2.1.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -32,9 +32,9 @@
 
   <os id="http://redhat.com/rhel/2.1.2";>
     <short-id>rhel2.1.2</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 2</name>
+    <_name>Red Hat Enterprise Linux 2.1 Update 2</_name>
     <version>2.1.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -47,9 +47,9 @@
 
   <os id="http://redhat.com/rhel/2.1.3";>
     <short-id>rhel2.1.3</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 3</name>
+    <_name>Red Hat Enterprise Linux 2.1 Update 3</_name>
     <version>2.1.3</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -62,9 +62,9 @@
 
   <os id="http://redhat.com/rhel/2.1.4";>
     <short-id>rhel2.1.4</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 4</name>
+    <_name>Red Hat Enterprise Linux 2.1 Update 4</_name>
     <version>2.1.4</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -77,9 +77,9 @@
 
   <os id="http://redhat.com/rhel/2.1.5";>
     <short-id>rhel2.1.5</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 5</name>
+    <_name>Red Hat Enterprise Linux 2.1 Update 5</_name>
     <version>2.1.5</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -92,9 +92,9 @@
 
   <os id="http://redhat.com/rhel/2.1.6";>
     <short-id>rhel2.1.6</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 6</name>
+    <_name>Red Hat Enterprise Linux 2.1 Update 6</_name>
     <version>2.1.6</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -107,9 +107,9 @@
 
   <os id="http://redhat.com/rhel/2.1.7";>
     <short-id>rhel2.1.7</short-id>
-    <name>Red Hat Enterprise Linux 2.1 Update 7</name>
+    <_name>Red Hat Enterprise Linux 2.1 Update 7</_name>
     <version>2.1.7</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
@@ -126,9 +126,9 @@
 
   <os id="http://redhat.com/rhel/3";>
     <short-id>rhel3</short-id>
-    <name>Red Hat Enterprise Linux 3</name>
+    <_name>Red Hat Enterprise Linux 3</_name>
     <version>3</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -139,9 +139,9 @@
 
   <os id="http://redhat.com/rhel/3.1";>
     <short-id>rhel3.1</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 1</name>
+    <_name>Red Hat Enterprise Linux 3 Update 1</_name>
     <version>3.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -154,9 +154,9 @@
 
   <os id="http://redhat.com/rhel/3.2";>
     <short-id>rhel3.2</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 2</name>
+    <_name>Red Hat Enterprise Linux 3 Update 2</_name>
     <version>3.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -169,9 +169,9 @@
 
   <os id="http://redhat.com/rhel/3.3";>
     <short-id>rhel3.3</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 3</name>
+    <_name>Red Hat Enterprise Linux 3 Update 3</_name>
     <version>3.3</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -184,9 +184,9 @@
 
   <os id="http://redhat.com/rhel/3.4";>
     <short-id>rhel3.4</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 4</name>
+    <_name>Red Hat Enterprise Linux 3 Update 4</_name>
     <version>3.4</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -199,9 +199,9 @@
 
   <os id="http://redhat.com/rhel/3.5";>
     <short-id>rhel3.5</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 5</name>
+    <_name>Red Hat Enterprise Linux 3 Update 5</_name>
     <version>3.5</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -214,9 +214,9 @@
 
   <os id="http://redhat.com/rhel/3.6";>
     <short-id>rhel3.6</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 6</name>
+    <_name>Red Hat Enterprise Linux 3 Update 6</_name>
     <version>3.6</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -229,9 +229,9 @@
 
   <os id="http://redhat.com/rhel/3.7";>
     <short-id>rhel3.7</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 7</name>
+    <_name>Red Hat Enterprise Linux 3 Update 7</_name>
     <version>3.7</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -244,9 +244,9 @@
 
   <os id="http://redhat.com/rhel/3.8";>
     <short-id>rhel3.8</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 8</name>
+    <_name>Red Hat Enterprise Linux 3 Update 8</_name>
     <version>3.8</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -259,9 +259,9 @@
 
   <os id="http://redhat.com/rhel/3.9";>
     <short-id>rhel3.9</short-id>
-    <name>Red Hat Enterprise Linux 3 Update 9</name>
+    <_name>Red Hat Enterprise Linux 3 Update 9</_name>
     <version>3.9</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
@@ -278,9 +278,9 @@
 
   <os id="http://redhat.com/rhel/4.0";>
     <short-id>rhel4.0</short-id>
-    <name>Red Hat Enterprise Linux 4.0</name>
+    <_name>Red Hat Enterprise Linux 4.0</_name>
     <version>4.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -291,9 +291,9 @@
 
   <os id="http://redhat.com/rhel/4.1";>
     <short-id>rhel4.1</short-id>
-    <name>Red Hat Enterprise Linux 4.1</name>
+    <_name>Red Hat Enterprise Linux 4.1</_name>
     <version>4.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -306,9 +306,9 @@
 
   <os id="http://redhat.com/rhel/4.2";>
     <short-id>rhel4.2</short-id>
-    <name>Red Hat Enterprise Linux 4.2</name>
+    <_name>Red Hat Enterprise Linux 4.2</_name>
     <version>4.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -321,9 +321,9 @@
 
   <os id="http://redhat.com/rhel/4.3";>
     <short-id>rhel4.3</short-id>
-    <name>Red Hat Enterprise Linux 4.3</name>
+    <_name>Red Hat Enterprise Linux 4.3</_name>
     <version>4.3</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -336,9 +336,9 @@
 
   <os id="http://redhat.com/rhel/4.4";>
     <short-id>rhel4.4</short-id>
-    <name>Red Hat Enterprise Linux 4.4</name>
+    <_name>Red Hat Enterprise Linux 4.4</_name>
     <version>4.4</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -351,9 +351,9 @@
 
   <os id="http://redhat.com/rhel/4.5";>
     <short-id>rhel4.5</short-id>
-    <name>Red Hat Enterprise Linux 4.5</name>
+    <_name>Red Hat Enterprise Linux 4.5</_name>
     <version>4.5</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -366,9 +366,9 @@
 
   <os id="http://redhat.com/rhel/4.6";>
     <short-id>rhel4.6</short-id>
-    <name>Red Hat Enterprise Linux 4.6</name>
+    <_name>Red Hat Enterprise Linux 4.6</_name>
     <version>4.6</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -381,9 +381,9 @@
 
   <os id="http://redhat.com/rhel/4.7";>
     <short-id>rhel4.7</short-id>
-    <name>Red Hat Enterprise Linux 4.7</name>
+    <_name>Red Hat Enterprise Linux 4.7</_name>
     <version>4.7</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -396,9 +396,9 @@
 
   <os id="http://redhat.com/rhel/4.8";>
     <short-id>rhel4.8</short-id>
-    <name>Red Hat Enterprise Linux 4.8</name>
+    <_name>Red Hat Enterprise Linux 4.8</_name>
     <version>4.8</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -424,9 +424,9 @@
 
   <os id="http://redhat.com/rhel/4.9";>
     <short-id>rhel4.9</short-id>
-    <name>Red Hat Enterprise Linux 4.9</name>
+    <_name>Red Hat Enterprise Linux 4.9</_name>
     <version>4.9</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
@@ -456,9 +456,9 @@
 
   <os id="http://redhat.com/rhel/5.0";>
     <short-id>rhel5.0</short-id>
-    <name>Red Hat Enterprise Linux 5.0</name>
+    <_name>Red Hat Enterprise Linux 5.0</_name>
     <version>5.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -470,9 +470,9 @@
 
   <os id="http://redhat.com/rhel/5.1";>
     <short-id>rhel5.1</short-id>
-    <name>Red Hat Enterprise Linux 5.1</name>
+    <_name>Red Hat Enterprise Linux 5.1</_name>
     <version>5.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -485,9 +485,9 @@
 
   <os id="http://redhat.com/rhel/5.2";>
     <short-id>rhel5.2</short-id>
-    <name>Red Hat Enterprise Linux 5.2</name>
+    <_name>Red Hat Enterprise Linux 5.2</_name>
     <version>5.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -500,9 +500,9 @@
 
   <os id="http://redhat.com/rhel/5.3";>
     <short-id>rhel5.3</short-id>
-    <name>Red Hat Enterprise Linux 5.3</name>
+    <_name>Red Hat Enterprise Linux 5.3</_name>
     <version>5.3</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -515,9 +515,9 @@
 
   <os id="http://redhat.com/rhel/5.4";>
     <short-id>rhel5.4</short-id>
-    <name>Red Hat Enterprise Linux 5.4</name>
+    <_name>Red Hat Enterprise Linux 5.4</_name>
     <version>5.4</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -543,9 +543,9 @@
 
   <os id="http://redhat.com/rhel/5.5";>
     <short-id>rhel5.5</short-id>
-    <name>Red Hat Enterprise Linux 5.5</name>
+    <_name>Red Hat Enterprise Linux 5.5</_name>
     <version>5.5</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -558,9 +558,9 @@
 
   <os id="http://redhat.com/rhel/5.6";>
     <short-id>rhel5.6</short-id>
-    <name>Red Hat Enterprise Linux 5.6</name>
+    <_name>Red Hat Enterprise Linux 5.6</_name>
     <version>5.6</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -591,9 +591,9 @@
 
   <os id="http://redhat.com/rhel/5.7";>
     <short-id>rhel5.7</short-id>
-    <name>Red Hat Enterprise Linux 5.7</name>
+    <_name>Red Hat Enterprise Linux 5.7</_name>
     <version>5.7</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -619,9 +619,9 @@
 
   <os id="http://redhat.com/rhel/5.8";>
     <short-id>rhel5.8</short-id>
-    <name>Red Hat Enterprise Linux 5.8</name>
+    <_name>Red Hat Enterprise Linux 5.8</_name>
     <version>5.8</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
@@ -638,9 +638,9 @@
 
   <os id="http://redhat.com/rhel/6.0";>
     <short-id>rhel6.0</short-id>
-    <name>Red Hat Enterprise Linux 6.0</name>
+    <_name>Red Hat Enterprise Linux 6.0</_name>
     <version>6.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Santiago</codename>
@@ -670,9 +670,9 @@
 
   <os id="http://redhat.com/rhel/6.1";>
     <short-id>rhel6.1</short-id>
-    <name>Red Hat Enterprise Linux 6.1</name>
+    <_name>Red Hat Enterprise Linux 6.1</_name>
     <version>6.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Santiago</codename>
@@ -698,9 +698,9 @@
 
   <os id="http://redhat.com/rhel/6.2";>
     <short-id>rhel6.2</short-id>
-    <name>Red Hat Enterprise Linux 6.2</name>
+    <_name>Red Hat Enterprise Linux 6.2</_name>
     <version>6.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhel</distro>
     <codename>Santiago</codename>
diff --git a/data/oses/rhl.xml b/data/oses/rhl.xml.in
similarity index 82%
rename from data/oses/rhl.xml
rename to data/oses/rhl.xml.in
index c98e0a3..2c134de 100644
--- a/data/oses/rhl.xml
+++ b/data/oses/rhl.xml.in
@@ -2,9 +2,9 @@
 
   <os id="http://redhat.com/rhl/1.0";>
     <short-id>rhl1.0</short-id>
-    <name>Red Hat Linux 1.0</name>
+    <_name>Red Hat Linux 1.0</_name>
     <version>1.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Mother's Day</codename>
@@ -14,9 +14,9 @@
 
   <os id="http://redhat.com/rhl/1.1";>
     <short-id>rhl1.1</short-id>
-    <name>Red Hat Linux 1.1</name>
+    <_name>Red Hat Linux 1.1</_name>
     <version>1.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Mother's Day + 0.1</codename>
@@ -28,9 +28,9 @@
 
   <os id="http://redhat.com/rhl/2.0";>
     <short-id>rhl2.0</short-id>
-    <name>Red Hat Linux 2.0</name>
+    <_name>Red Hat Linux 2.0</_name>
     <version>2.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <upgrades id="http://redhat.com/rhl/1.1"/>
@@ -41,9 +41,9 @@
 
   <os id="http://redhat.com/rhl/2.1";>
     <short-id>rhl2.1</short-id>
-    <name>Red Hat Linux 2.1</name>
+    <_name>Red Hat Linux 2.1</_name>
     <version>2.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <upgrades id="http://redhat.com/rhl/2.0"/>
@@ -54,9 +54,9 @@
 
   <os id="http://redhat.com/rhl/3.0.3";>
     <short-id>rhl3.0.3</short-id>
-    <name>Red Hat Linux 3.0.3</name>
+    <_name>Red Hat Linux 3.0.3</_name>
     <version>3.0.3</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Picasso</codename>
@@ -68,9 +68,9 @@
 
   <os id="http://redhat.com/rhl/4.0";>
     <short-id>rhl4.0</short-id>
-    <name>Red Hat Linux 4.0</name>
+    <_name>Red Hat Linux 4.0</_name>
     <version>4.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Colgate</codename>
@@ -82,9 +82,9 @@
 
   <os id="http://redhat.com/rhl/4.1";>
     <short-id>rhl4.1</short-id>
-    <name>Red Hat Linux 4.1</name>
+    <_name>Red Hat Linux 4.1</_name>
     <version>4.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Vanderbilt</codename>
@@ -96,9 +96,9 @@
 
   <os id="http://redhat.com/rhl/4.2";>
     <short-id>rhl4.2</short-id>
-    <name>Red Hat Linux 4.2</name>
+    <_name>Red Hat Linux 4.2</_name>
     <version>4.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Biltmore</codename>
@@ -110,9 +110,9 @@
 
   <os id="http://redhat.com/rhl/5.0";>
     <short-id>rhl5.0</short-id>
-    <name>Red Hat Linux 5.0</name>
+    <_name>Red Hat Linux 5.0</_name>
     <version>5.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Hurricane</codename>
@@ -124,9 +124,9 @@
 
   <os id="http://redhat.com/rhl/5.1";>
     <short-id>rhl5.1</short-id>
-    <name>Red Hat Linux 5.1</name>
+    <_name>Red Hat Linux 5.1</_name>
     <version>5.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Manhattan</codename>
@@ -138,9 +138,9 @@
 
   <os id="http://redhat.com/rhl/5.2";>
     <short-id>rhl5.2</short-id>
-    <name>Red Hat Linux 5.2</name>
+    <_name>Red Hat Linux 5.2</_name>
     <version>5.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Apollo</codename>
@@ -152,9 +152,9 @@
 
   <os id="http://redhat.com/rhl/6.0";>
     <short-id>rhl6.0</short-id>
-    <name>Red Hat Linux 6.0</name>
+    <_name>Red Hat Linux 6.0</_name>
     <version>6.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Hedwig</codename>
@@ -166,9 +166,9 @@
 
   <os id="http://redhat.com/rhl/6.1";>
     <short-id>rhl6.1</short-id>
-    <name>Red Hat Linux 6.1</name>
+    <_name>Red Hat Linux 6.1</_name>
     <version>6.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Cartman</codename>
@@ -180,9 +180,9 @@
 
   <os id="http://redhat.com/rhl/6.2";>
     <short-id>rhl6.2</short-id>
-    <name>Red Hat Linux 6.2</name>
+    <_name>Red Hat Linux 6.2</_name>
     <version>6.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Zoot</codename>
@@ -194,9 +194,9 @@
 
   <os id="http://redhat.com/rhl/7";>
     <short-id>rhl7</short-id>
-    <name>Red Hat Linux 7</name>
+    <_name>Red Hat Linux 7</_name>
     <version>7</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Guinness</codename>
@@ -208,9 +208,9 @@
 
   <os id="http://redhat.com/rhl/7.1";>
     <short-id>rhl7.1</short-id>
-    <name>Red Hat Linux 7.1</name>
+    <_name>Red Hat Linux 7.1</_name>
     <version>7.1</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Seawolf</codename>
@@ -223,9 +223,9 @@
 
   <os id="http://redhat.com/rhl/7.2";>
     <short-id>rhl7.2</short-id>
-    <name>Red Hat Linux 7.2</name>
+    <_name>Red Hat Linux 7.2</_name>
     <version>7.2</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Enigma</codename>
@@ -238,9 +238,9 @@
 
   <os id="http://redhat.com/rhl/7.3";>
     <short-id>rhl7.3</short-id>
-    <name>Red Hat Linux 7.3</name>
+    <_name>Red Hat Linux 7.3</_name>
     <version>7.3</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Valhalla</codename>
@@ -253,9 +253,9 @@
 
   <os id="http://redhat.com/rhl/8.0";>
     <short-id>rhl8.0</short-id>
-    <name>Red Hat Linux 8.0</name>
+    <_name>Red Hat Linux 8.0</_name>
     <version>8.0</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Psyche</codename>
@@ -268,9 +268,9 @@
 
   <os id="http://redhat.com/rhl/9";>
     <short-id>rhl9</short-id>
-    <name>Red Hat Linux 9</name>
+    <_name>Red Hat Linux 9</_name>
     <version>9</version>
-    <vendor>Red Hat, Inc</vendor>
+    <_vendor>Red Hat, Inc</_vendor>
     <family>linux</family>
     <distro>rhl</distro>
     <codename>Shrike</codename>
diff --git a/data/oses/solaris.xml b/data/oses/solaris.xml.in
similarity index 80%
rename from data/oses/solaris.xml
rename to data/oses/solaris.xml.in
index fcbe952..86b2e9a 100644
--- a/data/oses/solaris.xml
+++ b/data/oses/solaris.xml.in
@@ -2,18 +2,18 @@
 
   <os id="http://sun.com/solaris/9";>
     <short-id>solaris9</short-id>
-    <name>Sun Solaris 9</name>
+    <_name>Sun Solaris 9</_name>
     <version>9</version>
-    <vendor>Sun</vendor>
+    <_vendor>Sun</_vendor>
     <family>solaris</family>
     <distro>solaris</distro>
   </os>
 
   <os id="http://sun.com/solaris/10";>
     <short-id>solaris10</short-id>
-    <name>Sun Solaris 10</name>
+    <_name>Sun Solaris 10</_name>
     <version>10</version>
-    <vendor>Sun</vendor>
+    <_vendor>Sun</_vendor>
     <family>solaris</family>
     <distro>solaris</distro>
     <upgrades id="http://sun.com/solaris/9"/>
@@ -25,9 +25,9 @@
 
   <os id="http://oracle.com/opensolaris/2009.06";>
     <short-id>opensolaris2009.06</short-id>
-    <name>Sun OpenSolaris 2009.06</name>
+    <_name>Sun OpenSolaris 2009.06</_name>
     <version>2009.06</version>
-    <vendor>Sun</vendor>
+    <_vendor>Sun</_vendor>
     <family>solaris</family>
     <distro>opensolaris</distro>
 
diff --git a/data/oses/suse.xml b/data/oses/suse.xml.in
similarity index 78%
rename from data/oses/suse.xml
rename to data/oses/suse.xml.in
index 135206f..90aeb7f 100644
--- a/data/oses/suse.xml
+++ b/data/oses/suse.xml.in
@@ -2,18 +2,18 @@
 
   <os id="http://suse.com/sles/9";>
     <short-id>sles9</short-id>
-    <name>Suse Linux Enterprise Server 9</name>
+    <_name>Suse Linux Enterprise Server 9</_name>
     <version>9</version>
-    <vendor>Novell</vendor>
+    <_vendor>Novell</_vendor>
     <family>linux</family>
     <distro>sles</distro>
   </os>
 
   <os id="http://suse.com/sles/10";>
     <short-id>sles10</short-id>
-    <name>Suse Linux Enterprise Server 10</name>
+    <_name>Suse Linux Enterprise Server 10</_name>
     <version>10</version>
-    <vendor>Novell</vendor>
+    <_vendor>Novell</_vendor>
     <family>linux</family>
     <distro>sles</distro>
     <upgrades id="http://suse.com/sles/9"/>
@@ -21,9 +21,9 @@
 
   <os id="http://suse.com/sles/11";>
     <short-id>sles11</short-id>
-    <name>Suse Linux Enterprise Server 11</name>
+    <_name>Suse Linux Enterprise Server 11</_name>
     <version>11</version>
-    <vendor>Novell</vendor>
+    <_vendor>Novell</_vendor>
     <family>linux</family>
     <distro>sles</distro>
     <upgrades id="http://suse.com/sles/10"/>
@@ -36,18 +36,18 @@
 
   <os id="http://suse.com/sled/9";>
     <short-id>sled9</short-id>
-    <name>Suse Linux Enterprise Desktop 9</name>
+    <_name>Suse Linux Enterprise Desktop 9</_name>
     <version>9</version>
-    <vendor>Novell</vendor>
+    <_vendor>Novell</_vendor>
     <family>linux</family>
     <distro>sled</distro>
   </os>
 
   <os id="http://suse.com/sled/10";>
     <short-id>sled10</short-id>
-    <name>Suse Linux Enterprise Desktop 10</name>
+    <_name>Suse Linux Enterprise Desktop 10</_name>
     <version>10</version>
-    <vendor>Novell</vendor>
+    <_vendor>Novell</_vendor>
     <family>linux</family>
     <distro>sled</distro>
     <upgrades id="http://suse.com/sled/9"/>
@@ -66,9 +66,9 @@
 
   <os id="http://suse.com/sled/11";>
     <short-id>sled11</short-id>
-    <name>Suse Linux Enterprise Desktop 11</name>
+    <_name>Suse Linux Enterprise Desktop 11</_name>
     <version>11</version>
-    <vendor>Novell</vendor>
+    <_vendor>Novell</_vendor>
     <family>linux</family>
     <distro>sled</distro>
     <upgrades id="http://suse.com/sled/10"/>
diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml.in
similarity index 96%
rename from data/oses/ubuntu.xml
rename to data/oses/ubuntu.xml.in
index bc65a0e..8c3c8d2 100644
--- a/data/oses/ubuntu.xml
+++ b/data/oses/ubuntu.xml.in
@@ -3,9 +3,9 @@
   <os id="http://ubuntu.com/ubuntu/4.10";>
     <short-id>ubuntu4.10</short-id>
     <short-id>ubuntuwarty</short-id>
-    <name>Ubuntu Warty Warthog</name>
+    <_name>Ubuntu Warty Warthog</_name>
     <version>4.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Warty Warthog</codename>
@@ -46,9 +46,9 @@
   <os id="http://ubuntu.com/ubuntu/5.04";>
     <short-id>ubuntu5.04</short-id>
     <short-id>ubuntuhoary</short-id>
-    <name>Ubuntu Hoary Hedgehog</name>
+    <_name>Ubuntu Hoary Hedgehog</_name>
     <version>5.04</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Hoary Hedgehog</codename>
@@ -119,9 +119,9 @@
   <os id="http://ubuntu.com/ubuntu/5.10";>
     <short-id>ubuntu5.10</short-id>
     <short-id>ubuntubreezy</short-id>
-    <name>Ubuntu Breezy Badger</name>
+    <_name>Ubuntu Breezy Badger</_name>
     <version>5.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Breezy Badger</codename>
@@ -220,9 +220,9 @@
   <os id="http://ubuntu.com/ubuntu/6.06";>
     <short-id>ubuntu6.06</short-id>
     <short-id>ubuntudapper</short-id>
-    <name>Ubuntu Dapper Drake LTS</name>
+    <_name>Ubuntu Dapper Drake LTS</_name>
     <version>6.06</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Dapper Drake</codename>
@@ -367,9 +367,9 @@
   <os id="http://ubuntu.com/ubuntu/6.10";>
     <short-id>ubuntu6.10</short-id>
     <short-id>ubuntuedgy</short-id>
-    <name>Ubuntu Edgy Eft</name>
+    <_name>Ubuntu Edgy Eft</_name>
     <version>6.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Edgy Eft</codename>
@@ -448,9 +448,9 @@
   <os id="http://ubuntu.com/ubuntu/7.04";>
     <short-id>ubuntu7.04</short-id>
     <short-id>ubuntufeisty</short-id>
-    <name>Ubuntu Feisty Fawn</name>
+    <_name>Ubuntu Feisty Fawn</_name>
     <version>7.04</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Feisty Fawn</codename>
@@ -511,9 +511,9 @@
   <os id="http://ubuntu.com/ubuntu/7.10";>
     <short-id>ubuntu7.10</short-id>
     <short-id>ubuntugutsy</short-id>
-    <name>Ubuntu Gutsy Gibbon</name>
+    <_name>Ubuntu Gutsy Gibbon</_name>
     <version>7.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Gutsy Gibbon</codename>
@@ -574,9 +574,9 @@
   <os id="http://ubuntu.com/ubuntu/8.04";>
     <short-id>ubuntu8.04</short-id>
     <short-id>ubuntuhardy</short-id>
-    <name>Ubuntu Hardy Heron LTS</name>
+    <_name>Ubuntu Hardy Heron LTS</_name>
     <version>8.04</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Hardy Heron</codename>
@@ -650,9 +650,9 @@
   <os id="http://ubuntu.com/ubuntu/8.10";>
     <short-id>ubuntu8.10</short-id>
     <short-id>ubuntuintrepid</short-id>
-    <name>Ubuntu Intrepid Ibex</name>
+    <_name>Ubuntu Intrepid Ibex</_name>
     <version>8.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Intrepid Ibex</codename>
@@ -704,9 +704,9 @@
   <os id="http://ubuntu.com/ubuntu/9.04";>
     <short-id>ubuntu9.04</short-id>
     <short-id>ubuntujaunty</short-id>
-    <name>Ubuntu Jaunty Jackalope</name>
+    <_name>Ubuntu Jaunty Jackalope</_name>
     <version>9.04</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Jaunty Jackalope</codename>
@@ -762,9 +762,9 @@
   <os id="http://ubuntu.com/ubuntu/9.10";>
     <short-id>ubuntu9.10</short-id>
     <short-id>ubuntukarmic</short-id>
-    <name>Ubuntu Karmic Koala</name>
+    <_name>Ubuntu Karmic Koala</_name>
     <version>9.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Karmic Koala</codename>
@@ -816,9 +816,9 @@
   <os id="http://ubuntu.com/ubuntu/10.04";>
     <short-id>ubuntu10.04</short-id>
     <short-id>ubuntulucid</short-id>
-    <name>Ubuntu Lucid Lynx LTS</name>
+    <_name>Ubuntu Lucid Lynx LTS</_name>
     <version>10.04</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Lucid Lynx</codename>
@@ -863,9 +863,9 @@
   <os id="http://ubuntu.com/ubuntu/10.10";>
     <short-id>ubuntu10.10</short-id>
     <short-id>ubuntumaverick</short-id>
-    <name>Ubuntu Maverick Meerkat</name>
+    <_name>Ubuntu Maverick Meerkat</_name>
     <version>10.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Maverick Meerkat</codename>
@@ -930,9 +930,9 @@
   <os id="http://ubuntu.com/ubuntu/11.04";>
     <short-id>ubuntu11.04</short-id>
     <short-id>ubuntunatty</short-id>
-    <name>Ubuntu Natty Narwhal</name>
+    <_name>Ubuntu Natty Narwhal</_name>
     <version>11.04</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Natty Narwhal</codename>
@@ -997,9 +997,9 @@
   <os id="http://ubuntu.com/ubuntu/11.10";>
     <short-id>ubuntu11.10</short-id>
     <short-id>ubuntuoneiric</short-id>
-    <name>Ubuntu Oneiric Ocelot</name>
+    <_name>Ubuntu Oneiric Ocelot</_name>
     <version>11.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Oneiric Ocelot</codename>
@@ -1064,9 +1064,9 @@
   <os id="http://ubuntu.com/ubuntu/12.04";>
     <short-id>ubuntu12.04</short-id>
     <short-id>ubuntuprecise</short-id>
-    <name>Ubuntu Precise Pangolin LTS</name>
+    <_name>Ubuntu Precise Pangolin LTS</_name>
     <version>12.04</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Precise Pangolin</codename>
@@ -1125,9 +1125,9 @@
   <os id="http://ubuntu.com/ubuntu/12.10";>
     <short-id>ubuntu12.10</short-id>
     <short-id>ubuntuquantal</short-id>
-    <name>Ubuntu Quantal Quetzal</name>
+    <_name>Ubuntu Quantal Quetzal</_name>
     <version>12.10</version>
-    <vendor>Canonical Ltd</vendor>
+    <_vendor>Canonical Ltd</_vendor>
     <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Quantal Quetzal</codename>
diff --git a/data/oses/windows.xml b/data/oses/windows.xml.in
similarity index 92%
rename from data/oses/windows.xml
rename to data/oses/windows.xml.in
index 90ee4d9..8ba9e8d 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml.in
@@ -77,8 +77,8 @@
 
   <os id="http://microsoft.com/win/1.0";>
     <short-id>win1.0</short-id>
-    <name>Microsoft Windows 1.0</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows 1.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>win16</family>
     <distro>win</distro>
     <version>1.0</version>
@@ -89,8 +89,8 @@
 
   <os id="http://microsoft.com/win/2.0";>
     <short-id>win2.0</short-id>
-    <name>Microsoft Windows 2.0</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows 2.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>win16</family>
     <distro>win</distro>
     <version>2.0</version>
@@ -103,8 +103,8 @@
 
   <os id="http://microsoft.com/win/2.1";>
     <short-id>win2.1</short-id>
-    <name>Microsoft Windows 2.1</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows 2.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>win16</family>
     <distro>win</distro>
     <version>2.1</version>
@@ -117,8 +117,8 @@
 
   <os id="http://microsoft.com/win/3.1";>
     <short-id>win3.1</short-id>
-    <name>Microsoft Windows 3.1</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows 3.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>win16</family>
     <distro>win</distro>
     <version>3.1</version>
@@ -131,8 +131,8 @@
 
   <os id="http://microsoft.com/winnt/3.1";>
     <short-id>winnt3.1</short-id>
-    <name>Microsoft Windows NT Server 3.1</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows NT Server 3.1</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>winnt</distro>
     <version>3.1</version>
@@ -142,8 +142,8 @@
 
   <os id="http://microsoft.com/winnt/3.5";>
     <short-id>winnt3.5</short-id>
-    <name>Microsoft Windows NT Server 3.5</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows NT Server 3.5</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>winnt</distro>
     <version>3.5</version>
@@ -156,8 +156,8 @@
 
   <os id="http://microsoft.com/winnt/3.51";>
     <short-id>winnt3.51</short-id>
-    <name>Microsoft Windows NT Server 3.51</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows NT Server 3.51</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>winnt</distro>
     <version>3.51</version>
@@ -170,8 +170,8 @@
 
   <os id="http://microsoft.com/winnt/4.0";>
     <short-id>winnt4.0</short-id>
-    <name>Microsoft Windows NT Server 4.0</name>
-    <vendor>Microsoft Corporation</vendor>
+    <_name>Microsoft Windows NT Server 4.0</_name>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>winnt</distro>
     <version>4.0</version>
@@ -184,9 +184,9 @@
 
   <os id="http://microsoft.com/win/95";>
     <short-id>win95</short-id>
-    <name>Microsoft Windows 95</name>
+    <_name>Microsoft Windows 95</_name>
     <version>4.0</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>win9x</family>
     <distro>win</distro>
     <upgrades id="http://microsoft.com/win/3.1"/>
@@ -213,9 +213,9 @@
 
   <os id="http://microsoft.com/win/98";>
     <short-id>win98</short-id>
-    <name>Microsoft Windows 98</name>
+    <_name>Microsoft Windows 98</_name>
     <version>4.1</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>win9x</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/95"/>
@@ -240,9 +240,9 @@
 
   <os id="http://microsoft.com/win/me";>
     <short-id>winme</short-id>
-    <name>Microsoft Windows Millennium Edition</name>
+    <_name>Microsoft Windows Millennium Edition</_name>
     <version>4.9</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>win9x</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/98"/>
@@ -268,9 +268,9 @@
 
   <os id="http://microsoft.com/win/2k";>
     <short-id>win2k</short-id>
-    <name>Microsoft Windows 2000</name>
+    <_name>Microsoft Windows 2000</_name>
     <version>5.0</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/me"/>
@@ -316,9 +316,9 @@
 
   <os id="http://microsoft.com/win/xp";>
     <short-id>winxp</short-id>
-    <name>Microsoft Windows XP</name>
+    <_name>Microsoft Windows XP</_name>
     <version>5.1</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/2k"/>
@@ -375,9 +375,9 @@
 
   <os id="http://microsoft.com/win/2k3";>
     <short-id>win2k3</short-id>
-    <name>Microsoft Windows Server 2003</name>
+    <_name>Microsoft Windows Server 2003</_name>
     <version>5.2</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/2k"/>
@@ -443,9 +443,9 @@
 
   <os id="http://microsoft.com/win/2k3r2";>
     <short-id>win2k3r2</short-id>
-    <name>Microsoft Windows Server 2003 R2</name>
+    <_name>Microsoft Windows Server 2003 R2</_name>
     <version>5.2</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/2k3"/>
@@ -505,9 +505,9 @@
 
   <os id="http://microsoft.com/win/2k8";>
     <short-id>win2k8</short-id>
-    <name>Microsoft Windows Server 2008</name>
+    <_name>Microsoft Windows Server 2008</_name>
     <version>6.0</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/2k3r2"/>
@@ -567,9 +567,9 @@
 
   <os id="http://microsoft.com/win/2k8r2";>
     <short-id>win2k8r2</short-id>
-    <name>Microsoft Windows Server 2008 R2</name>
+    <_name>Microsoft Windows Server 2008 R2</_name>
     <version>6.1</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/2k8"/>
@@ -614,9 +614,9 @@
 
   <os id="http://microsoft.com/win/vista";>
     <short-id>winvista</short-id>
-    <name>Microsoft Windows Vista</name>
+    <_name>Microsoft Windows Vista</_name>
     <version>6.0</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/xp"/>
@@ -660,9 +660,9 @@
 
   <os id="http://microsoft.com/win/7";>
     <short-id>win7</short-id>
-    <name>Microsoft Windows 7</name>
+    <_name>Microsoft Windows 7</_name>
     <version>6.1</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/vista"/>
@@ -715,9 +715,9 @@
 
   <os id="http://microsoft.com/win/8";>
     <short-id>win8</short-id>
-    <name>Microsoft Windows 8</name>
+    <_name>Microsoft Windows 8</_name>
     <version>6.2</version>
-    <vendor>Microsoft Corporation</vendor>
+    <_vendor>Microsoft Corporation</_vendor>
     <family>winnt</family>
     <distro>win</distro>
     <derives-from id="http://microsoft.com/win/7"/>
diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
index 847c086..07a8fef 100644
--- a/data/schemas/libosinfo.rng
+++ b/data/schemas/libosinfo.rng
@@ -28,9 +28,16 @@
         <ref name='url'/>
       </attribute>
       <interleave>
-        <element name='name'>
-          <text/>
-        </element>
+        <oneOrMore>
+          <element name='name'>
+            <optional>
+              <attribute name='xml:lang'>
+                <text/>
+              </attribute>
+            </optional>
+            <text/>
+          </element>
+        </oneOrMore>
         <element name='bus-type'>
           <choice>
             <value>isa</value>
@@ -57,11 +64,16 @@
             </choice>
           </element>
         </optional>
-        <optional>
+        <zeroOrMore>
           <element name='vendor'>
+            <optional>
+              <attribute name='xml:lang'>
+                <text/>
+              </attribute>
+            </optional>
             <text/>
           </element>
-        </optional>
+        </zeroOrMore>
         <optional>
           <element name='vendor-id'>
             <ref name='hexid'/>
@@ -94,12 +106,26 @@
 
   <define name="product-content">
     <interleave>
-      <element name='vendor'>
-        <text/>
-      </element>
-      <element name='name'>
-        <text/>
-      </element>
+      <oneOrMore>
+        <element name='vendor'>
+          <optional>
+            <attribute name='xml:lang'>
+              <text/>
+            </attribute>
+          </optional>
+          <text/>
+        </element>
+      </oneOrMore>
+      <oneOrMore>
+        <element name='name'>
+          <optional>
+            <attribute name='xml:lang'>
+              <text/>
+            </attribute>
+          </optional>
+          <text/>
+        </element>
+      </oneOrMore>
       <oneOrMore>
         <element name='short-id'>
           <text/>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e69de29..2257997 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -0,0 +1,25 @@
+data/oses/netware.xml.in
+data/oses/solaris.xml.in
+data/oses/dos.xml.in
+data/oses/mandrake.xml.in
+data/oses/mandriva.xml.in
+data/oses/suse.xml.in
+data/oses/gnome.xml.in
+data/oses/rhel.xml.in
+data/oses/fedora.xml.in
+data/oses/windows.xml.in
+data/oses/opensuse.xml.in
+data/oses/macos.xml.in
+data/oses/debian.xml.in
+data/oses/ubuntu.xml.in
+data/oses/centos.xml.in
+data/oses/openbsd.xml.in
+data/oses/freebsd.xml.in
+data/oses/rhl.xml.in
+data/oses/netbsd.xml.in
+data/devices/qemu-ps2.xml.in
+data/devices/qemu-pci.xml.in
+data/devices/virtio-pci.xml.in
+data/devices/qemu-usb.xml.in
+data/hypervisors/rhel-xen.xml.in
+data/hypervisors/xen.xml.in
-- 
1.7.12.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]