Refresh translations from zanata

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>

95 files changed, 16814 insertions, 15199 deletions

diff --git a/po/af.po b/po/af.po
index 14dcbe0..f278a45 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Afrikaans\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/am.po b/po/am.po
index 4242471..2613701 100644
--- a/po/am.po
+++ b/po/am.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Amharic\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/anp.po b/po/anp.po
index 91f6986..df2a8c1 100644
--- a/po/anp.po
+++ b/po/anp.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Angika\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index bc4f82b..7f58170 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Arabic\n"
@@ -19,317 +19,324 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/as.po b/po/as.po
index 513ac08..1185796 100644
--- a/po/as.po
+++ b/po/as.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Assamese\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 73a121d..f122764 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Asturian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/bal.po b/po/bal.po
index 0de0bdf..b513dd4 100644
--- a/po/bal.po
+++ b/po/bal.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Baluchi\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/be.po b/po/be.po
index 80ced72..d03eb3f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Belarusian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 5f50ca9..ae4a671 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bulgarian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 752ce30..3a8467f 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bengali\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 021c967..18e7264 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bengali (India)\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/bo.po b/po/bo.po
index 342aa99..415431f 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Tibetan\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/br.po b/po/br.po
index 288b79d..e69d387 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Breton\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/brx.po b/po/brx.po
index 98f643b..944e0fc 100644
--- a/po/brx.po
+++ b/po/brx.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bodo\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 4293b01..b1172d5 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Bosnian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 426ee63..54a8aeb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,9 +4,9 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2018. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2018-02-23 04:05+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan\n"
@@ -17,234 +17,240 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr "Els mime-types permesos per a l'avatar"
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr "L'amplada requerida (en píxels) de l'avatar"
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr "L'alçada requerida (en píxels) de l'avatar."
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr "Si permet el canal alfa en l'avatar."
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Sistema operatiu"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Plataforma de virtualització"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Dispositiu de destinació"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "Filtre de la destinació de l'enllaç al dispositiu"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Identificador únic"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "Arquitectura de la CPU"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Nom del paràmetre"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "Política del paràmetre"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr "Assignació del valor del paràmetre"
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "URI per a la plantilla del guió d'instal·lació"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "Dades per a la plantilla del guió d'instal·lació"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "Nom del perfil del guió d'instal·lació"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "Format de la màscara de la clau del producte"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr "Format esperat del camí"
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr "Format esperat de l'avatar"
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "No es pot crear el context de l'analitzador sintàctic XML"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "No es pot llegir la plantilla XSL"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "No es pot crear analitzar sintàcticament la plantilla XSL"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "No es pot crear el context de transformació XSL"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "No es pot aplicar el context de transformació XSL"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "No es pot convertir la sortida del XSL a una cadena de text"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "Error en carregar la plantilla de guió %s:"
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "Error en aplicar la plantilla de guió %s:"
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "Error en aplicar la plantilla de guió:"
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "Llista els tipus d'elements"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr "S'esperava un nodeset en la consulta XPath %s"
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "S'esperava un text en el valor de l'atribut del node"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "Falta l'identificador de la propietat device"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "Falta l'identificador de la propietat device link"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "Falta l'identificador de la propietat product upgrades"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "Falta l'identificador de la propietat platform"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "Falta l'identificador de la propietat deployment"
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "Falta l'identificador de la propietat deployment os"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "Falta l'identificador de la propietat deployment platform"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "Falta l'identificador de la propietat os"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "Falta l'identificador de la propietat install script"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "Falta l'identificador de la propietat OS install script"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "Element root incorrecte"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "No es pot construir el context de l'analitzador sintàctic"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "Falta l'element XML root"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
@@ -252,7 +258,7 @@ msgstr ""
 "$OSINFO_DATA_DIR està en desús, utilitzeu $OSINFO_SYSTEM_DIR en lloc seu. La "
 "compatibilitat per a $OSINFO_DATA_DIR serà eliminada en un futur llançament\n"
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
@@ -261,77 +267,78 @@ msgstr ""
 "%s està en desús, utilitzeu %s en lloc seu. La compatibilitat per a %s serà "
 "eliminada en un futur llançament\n"
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "L'URL a aquest mitjà"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "L'identificador ISO9660 esperat del volum"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "L'identificador ISO9660 esperat de l'editor"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "L'identificador ISO9660 esperat de l'aplicació"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "L'identificador ISO9660 esperat del sistema"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "El camí a la imatge del kernel"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr "El camí a la imatge initrd"
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr "El mitjà proporciona una eina d'instal·lació"
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "El mitjà pot arrencar sense la instal·lació"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "Número de re-arrencades de l'eina d'instal·lació"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr "Informació quant al sistema operatiu en aquest mitjà"
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr "Idiomes suportats"
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr "S'esperava la mida del volum ISO9660, en bytes"
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr "Si els mitjans s'han d'expulsar després del procés d'instal·lació"
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "El mitjà d'instal·lació no es pot arrencar"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -341,6 +348,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "Ha fallat la lectura del descriptor suplementari del volum:"
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "El descriptor secundari del volum estava truncat"
 
@@ -349,10 +357,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "Ha fallat la lectura del descriptor primari del volum:"
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "El descriptor primari del volum estava truncat"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "Metadades insuficients en el mitjà d'instal·lació"
 
@@ -362,6 +372,7 @@ msgid "Failed to skip %d bytes"
 msgstr "Error en ometre %d bytes"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "Sense descriptors de volum"
 
@@ -381,45 +392,45 @@ msgstr "Distribució genèrica"
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Nom"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "Id. curt"
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Proveïdor"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Versió"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Nom clau"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "URI del logotip"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "Freqüència de la CPU amb hertz (Hz)"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Número de CPU"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Quantitat de RAM (Random Access Memory) en bytes"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Quantitat d'espai d'emmagatzematge en bytes"
 
@@ -463,180 +474,185 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "Ha fallat el processament del fitxer keyinfo: "
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr "El nom d'aquesta variant"
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "El valor no és vàlid «%s»"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Format de sortida. Per defecte: plain"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "media|tree."
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "El mitjà és d'arrencada.\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "El mitjà no és d'arrencada.\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "El mitjà és un instal·lador per al SO «%s»\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "El mitjà és un mitjà autònom per al SO «%s»\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr "Variants disponibles del SO en el mitjà:\n"
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "L'arbre és un instal·lador per al SO «%s»\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "- Detecta si el sistema operatiu es d'arrencada, el rellevant del SO i la "
 "distribució."
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 "Error en analitzar sintàcticament les opcions de la línia d'ordres: %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "Error en carregar les dades del SO: %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "Error en analitzar sintàcticament el mitjà: %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "Error en analitzar sintàcticament l'arbre de l'instal·lador: %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "Configuració esperada clau=valor"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "Perfil del guió d'instal·lació"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "Directori de sortida del guió d'instal·lació"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "El prefix del nom de fitxer de sortida"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "Estableix el paràmetre de configuració"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr "Llista els paràmetres de configuració"
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr "Llista els perfils del guió d'instal·lació"
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr "Llista els mètodes d'injecció suportats"
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr "No mostris els noms dels fitxers de sortida"
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr "Sense guió d'instal·lació per al perfil «%s» i el SO «%s»"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "obligatori"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "opcional"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr "Cap script d'instal·lació per al perfil «%s» i el SO «%s»\n"
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "No es pot generar el guió d'instal·lació: %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "- Genera un guió d'instal·lació del SO"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 "S'ha produït un error mentre s'analitzaven sintàcticament les opcions: %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
@@ -644,92 +660,93 @@ msgstr ""
 "Únicament es pot sol·licitar un dels següents--list-profile, --list-config o "
 "--list-injection-methods"
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Error en trobar el SO: %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Família"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Distribució"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Data del llançament"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "Fi del suport"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Nom clau"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "Identificador"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "Id. del proveïdor"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Producte"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "Id. del producte"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Classe"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Bus"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "Nom desconegut de propietat %s"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "Error sintàctic en la condició, s'espera CLAU=VALOR"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Ordena la columna"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Mostra els camps"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "- Consulta el SO en la base de dades"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "Falta el paràmetre de tipus de dades\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "S'ha sol·licitat un tipus desconegut «%s»\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "No es pot construir el filtre: %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "No es pot establir la visibilitat del camp: %s\n"
diff --git a/po/cs.po b/po/cs.po
index ffc53e7..4a5493f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,9 +3,9 @@
 # Pavel Borecki <pavel.borecki@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2019-04-04 05:27+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
 "Language-Team: Czech\n"
@@ -16,236 +16,242 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr "Povolené mime typy pro avatara"
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr "Požadovaná šířka avatara (v pixelech)"
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr "Požadovaná výška avatara (v pixelech)"
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr "Ať už je v avataru podporován alfa kanál."
 
 # auto translated by TM merge from project: FreeIPA, version: master-backup-
 # before-build-refactoring, DocId: install/po/ipa
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Operační systém"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Virtualizační platforma"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Cílové zařízení"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "Cílový filtr propojení zařízení"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Jedinečný identifikátor"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "Architektura CPU"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr "Formát tohoto obrazu"
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr "URL adresa tohoto obrazu"
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Název parametru"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "Politika parametru"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr "Mapování hodnot parametru"
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "URI pro šablonu instalačního skriptu"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "Data pro šablonu instalačního skriptu"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "Název profilu instalačního skriptu"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "Maska formátu klíče produktu"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr "Očekávaný formát cesty"
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr "Očekávaný formát avatara"
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr "Upřednostňovaná metoda vpravení"
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr "Instalační zdroj, který použít"
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "Nelze vytvořit kontext analyzátoru XML"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "Nelze přečíst šablonu XSL"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "Nelze analyzovat šablonu XSL"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr "Nedaří se vytvořit XML uzel „%s“"
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr "Nedaří se vytvořit XML uzel „id“"
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr "Nedaří se přidat podřízené XML"
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr "Nedaří se nastavit kořen XML"
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr "Nedaří se nastavit uzel „media“"
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "Nelze vytvořit kontext transformace XSL"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "Nelze použít kontext transformace XSL"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "Nelze převést výstup XSL na řetězec"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "Nelze načíst šablonu skriptu %s: "
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "Nelze použít šablonu skriptu %s: "
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "Nelze použít šablonu skriptu: "
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "Typ prvku seznamu"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr "Očekává se, že v XPath dotazu %s bude nodeset"
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "Očekává se hodnota atributu textového uzlu"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "Chybí vlastnost ID zařízení"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "Chybí vlastnost ID odkazu zařízení"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "Chybí vlastnost ID upgradu produktu"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "Chybí vlastnost ID platformy"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "Chybí vlastnost ID nasazení"
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "Chybí vlastnost ID OS nasazení"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "Chybí vlastnost ID platformy nasazení"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "Chybí vlastnost ID OS"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "Chybí vlastnost ID skriptu pro instalaci"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr "Chybějící vlastnost skriptu pro instalaci média"
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "Chybí vlastnost skriptu pro instalaci operačního systému"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "Nesprávný kořenový prvek"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "Nedaří se vytvořit kontext analyzátoru"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "Chybí kořenový element XML"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
@@ -253,7 +259,7 @@ msgstr ""
 "$OSINFO_DATA_DIR se už nepoužívá, použijte místo toho $OSINFO_SYSTEM_DIR. "
 "Podpora pro $OSINFO_DATA_DIR bude v budoucím vydání odebrána\n"
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
@@ -262,77 +268,78 @@ msgstr ""
 "%s se už nepoužívá, použijte místo toho %s. Podpora pro %s bude v budoucím "
 "vydání odebrána\n"
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "Adresa URL na toto médium"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "Očekávané ID svazku ISO9660"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "Očekávané ID vydavatele ISO9660"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "Očekávané ID aplikace ISO9660"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "Očekávané ID systému ISO9660"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "Popis umístění obrazu jádra"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr "Popis umístění obrazu initrd"
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr "Médium poskytující instalátor"
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "Média mohou být zaváděna přímo bez instalace"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "Počet restartů instalátoru"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr "Informace o operačním systému na tomto médiu"
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr "Podporované jazyky"
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr "Očekávaná velikost svazku ISO9660 v bajtech"
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr "Zda po instalaci vysunout médium"
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr "Zda by médium mělo být použito pro instalaci pomocí skriptů"
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "Z instalačního média nelze zavádět systém"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr "Nepodařilo se načíst rozlohu záznamu složky „%s“:"
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr "Žádný rozsah záznamu složky „%s“"
@@ -342,6 +349,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "Nepodařilo se přečíst doplňkový popisovač oddílu:"
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "Doplňkový popisovač oddílu byl zkrácen"
 
@@ -350,10 +358,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "Nepodařilo se přečíst hlavní popisovač oddílu:"
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "Popisovač hlavního oddílu byl zkrácen"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "Nedostatečná metadata na instalačních médiích"
 
@@ -363,6 +373,7 @@ msgid "Failed to skip %d bytes"
 msgstr "Nepodařilo se přeskočit %d bajtů"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "Žádné popisovače oddílu"
 
@@ -384,49 +395,49 @@ msgstr ""
 
 # auto translated by TM merge from project: imsettings, version: master,
 # DocId: imsettings
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Název"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "Stručný identifikátor"
 
 # auto translated by TM merge from project: FreeIPA, version: ipa-4-5, DocId:
 # po/ipa
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Výrobce"
 
 # auto translated by TM merge from project: Cockpit, version: rhel-7.4, DocId:
 # cockpit
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Verze"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Kódové jméno"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "URI loga"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "Frekvence procesoru v hertzech (Hz)"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Počet procesorů"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Množství paměti s náhodným přístupem (RAM) v bajtech"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Velikost úložného prostoru v bajtech"
 
@@ -470,179 +481,184 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "Nepodařilo se zpracovat soubor keyinfo:"
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr "Název této varianty"
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "Neplatná hodnota '%s'"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Výstupní formát. Výchozí: prostý"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "prostý|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "médium|strom."
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "Médium lze zavést.\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "Médium nelze zavést.\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "Médium je instalátor pro operační systém '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "Médium je živé médium pro operační systém '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr "Dostupné verze OS na médii:\n"
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "Strom je instalátor pro operační systém '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "- Zjistit, zda je médium zaveditelné, příslušný operační systém a distribuci."
 
 # auto translated by TM merge from project: osinfo-db-tools, version: master,
 # DocId: osinfo-db-tools
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr "Chyba při parsování voleb příkazové řádky: %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "Při načítání dat operačního systému došlo k chybě: %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "Chyba při analýze média: %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "Chyba při analýze stromu instalátoru: %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "Očekáván konfigurační klíč=hodnota"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "Nainstalovat profil skriptu"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "Nainstalovat adresář výstupního skriptu"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "Předpona výstupního názvu souboru"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr "Instalační zdroj který pro skript použít"
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "Nastavit konfigurační parametr"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr "Seznam parametrů konfigurace"
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr "Vypsat profily instalační skriptů"
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr "Seznam podporovaných metod injekce"
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr "Nezobrazovat výstupní názvy souborů"
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr "Žádný instalační skript pro profil '%s' a operační systém '%s'"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "vyžadovaný"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "volitelný"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr "Žádný instalační skript pro profil '%s' a operační systém '%s'\n"
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "Nelze generovat instalační skript: %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "- Generujte skript instalace OS"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr "Chyba při analýze možností: %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
@@ -650,100 +666,101 @@ msgstr ""
 "Lze požadovat pouze jeden z parametrů --list-profile, --list-config a --list-"
 "injection-methods"
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Chyba při hledání operačního systému: %s\n"
 
 # auto translated by TM merge from project: firewalld, version: master, DocId:
 # po/firewalld
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Rodina"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Distribuce"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Datum vydání"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "Konec podpory"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Kódové jméno"
 
 # auto translated by TM merge from project: im-chooser , version: master,
 # DocId: im-chooser
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "ID výrobce"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Produkt"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "ID produktu"
 
 # auto translated by TM merge from project: FreeIPA, version: ipa-4-5, DocId:
 # po/ipa
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Třída"
 
 # auto translated by TM merge from project: Cockpit, version: master, DocId:
 # cockpit
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Bus"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "Neznámý název vlastnosti %s"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "Chyba syntaxe v podmínce, očekává se KLÍČ=HODNOTA"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Uspořádat sloupec"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Zobrazit pole"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "- Dotázat se na databázi informací o operačním systému"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "Chybí parametr typu data\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "Požadován neznámý typ '%s'\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "Nepodařilo se vytvořit filtr: %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "Nelze nastavit viditelnost pole: %s\n"
diff --git a/po/cy.po b/po/cy.po
index d5eb5d1..8e3cf5b 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Welsh\n"
@@ -19,317 +19,324 @@ msgstr ""
 "11) ? 2 : 3\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index cb049d0..6b65b7a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Danish\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index fa570eb..01f5b14 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2015-02-20 07:44+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/libosinfo/"
@@ -19,317 +19,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Betriebssystem"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Virtualisierungsplattform"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Zielgerät"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "Filter für Link zum Zielgerät"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Eindeutiger Bezeichner"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "CPU-Architektur"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Parametername"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "Parameterregeln"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "URI der Installationsskript-Vorlage"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "Daten der Installationsskript-Vorlage"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "Profilname des Installationsskripts"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "Formatmaske des Produktschlüssels"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "XML-Parser-Kontext konnte nicht erzeugt werden"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "XSL-Vorlage konnte nicht gelesen werden"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "XSL-Vorlage konnte nicht verarbeitet werden"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "XSL-Transformationskontext konnte nicht erzeugt werden"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "XSL-Transformationskontext konnte nicht angewendet werden"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "XSL-Ausgabe konnte nicht in Zeichenkette umgewandelt werden"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "Skript-Vorlage %s konnte nicht geladen werden:"
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "Skript-Vorlage %s konnte nicht angewendet werden:"
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "Skript-Vorlage konnte nicht angewendet werden:"
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "Typ des Listenelements"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "Wert für Textknoten-Attribut erwartet"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "Eigenschaft »device id« fehlt"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "Eigenschaft »device link id« fehlt"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "Eigenschaft »product upgrades id« fehlt"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "Eigenschaft »platform id« fehlt"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "Eigenschaft »deployment id« fehlt"
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "Eigenschaft »deployment os id« fehlt"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "Eigenschaft »deployment platform id« fehlt"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "Eigenschaft »os id« fehlt"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "Eigenschaft »install script id« fehlt"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "Eigenschaft »install script« fehlt"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "Inkorrektes Wurzelelement"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "Parser-Kontext konnte nicht konstruiert werden"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "XML-Wurzelelement fehlt"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "URL zu diesem Medium"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "Die erwartete ISO9660-Datenträger-ID"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "Die erwartete ISO9660-Veröffentlicher-ID"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "Die erwartete ISO9660-Anwendungs-ID"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "Die erwartetet ID des ISO9660-Dateisystems"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "Pfad zum Kernel-Abbild"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "Das Medium kann direkt ohne Installation gebootet werden"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "Anzahl der Installer-Reboots"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "Installationsmedium ist nicht bootfähig"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "Deskriptor für weitere Datenträger konnte nicht gelesen werden:"
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "Deskriptor für weitere Datenträger wurde abgeschnitten"
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "Deskriptor für primären Datenträger konnte nicht gelesen werden:"
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "Primärer Datenträgerdeskriptor wurde abgeschnitten"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "Unzureichende Metadaten auf den Installationsmedien"
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr "%d Bytes konnten nicht übersprungen werden"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "Keine Datenträgerdeskriptoren"
 
@@ -379,45 +390,45 @@ msgstr "Generische Distribution"
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Name"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "Kurz-ID"
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Anbieter"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Version"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Codename"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "URI des Logos"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "CPU-Frequenz in Hertz (Hz)"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Anzahl der CPUs"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Größe des Arbeitsspeichers (RAM) in Byte"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Größe des Speicherplatzes in Byte"
 
@@ -461,269 +472,275 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "Keyinfo-Datei konnte nicht verarbeitet werden:"
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "Ungültiger Wert »%s«"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Ausgabeformat, Vorgabe: plain"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "media|tree."
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "Das Medium ist bootfähig.\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "Das Medium ist nicht bootfähig.\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "Das Medium ist ein Installer für das Betriebssystem »%s«\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "Das Medium ist ein Live-Medium für das Betriebssystem »%s«\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "Der Dateibaum ist ein Installer für das Betriebssystem »%s«\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "- erkennen, ob ein Medium bootfähig ist sowie das relevante Betriebssystem "
 "und die Distribution."
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr "Fehler beim Einlesen der Befehlszeilenoptionen: %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "Fehler beim Laden der Betriebssystemdaten: %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "Fehler beim Einlesen des Mediums: %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "Fehler beim Verarbeiten des Installer-Dateibaums: %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "Konfiguration Schlüssel=Wert erwartet"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "Profil des Installationsskripts"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "Ausgabeverzeichnis des Installationsskripts"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "Präfix des Namens der Ausgabedatei"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "Konfigurationsparameter setzen"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "Installationsskript konnte nicht erstellt werden: %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "- ein Betriebssystem-Installationsskript erzeugen"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr "Fehler beim Verarbeiten der Optionen: %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Fehler beim Finden des Betriebssystems: %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Familie"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Distribution"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Veröffentlichungsdatum"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "Ende der Lebensdauer"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Codename"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "Anbieter-ID"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Produkt"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "Produkt-ID"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Klasse"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Bus"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "Unbekannter Eigenschaftsname %s"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "Syntaxfehler in Bedingung, SCHLÜSSEL=WERT wurde erwartet"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Sortierspalte"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Felder anzeigen"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "- die OS-Info-Datenbank abfragen"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "Datentyp-Parameter fehlt\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "Unbekannter Typ »%s« wurde angefragt\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "Filter konnte nicht konstruiert werden: %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "Sichtbarkeit des Feldes konnte nicht gesetzt werden: %s\n"
diff --git a/po/de_CH.po b/po/de_CH.po
index 9f929fc..adcbe9b 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: German (Switzerland)\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 7af6472..f09dc1f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 6cb6423..5210225 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English (United Kingdom)\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 0a2acae..52c7c89 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Esperanto\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 0ea7315..1efadc1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2015-02-20 07:44+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/libosinfo/"
@@ -19,317 +19,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Sistema operativo"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Plataforma de virtualización"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Identificador único"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "Arquitectura de CPU"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Nombre de parámetro"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "Incapaz de crear contexto de parseo XML"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "Incapaz de leer plantilla XSL"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "Incapaz de parsear plantilla XSL"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "La URL a este medio"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Versión"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "URI del logo"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Número de CPU"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "Valor inválido '%s'"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Formato de salida. Defecto: plano"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Error al encontrar SO: %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Familia"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Distribución"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Fecha de lanzamiento"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Producto"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Ordenar columna"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Mostrar campos"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/et.po b/po/et.po
index f69aa0f..1febd8d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Estonian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 13180a3..a925438 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Basque\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 47c9486..88e74d9 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Persian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index d59196d..aedc852 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,9 +1,9 @@
 # Toni Rantala <trantalafilo@gmail.com>, 2017. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2017-03-25 06:46+0000\n"
 "Last-Translator: Toni Rantala <trantalafilo@gmail.com>\n"
 "Language-Team: Finnish\n"
@@ -14,317 +14,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Käyttöjärjestelmä"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Virtualisointi alusta"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Kohde laita"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "CPU arkkitehtuuri"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr "Tuetut kielet"
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -334,6 +341,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -342,10 +350,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -355,6 +365,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -374,45 +385,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Nimi"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "Lyhyt ID"
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Valmistaja"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Versio"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Koodinimi"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "logon URI"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "CPU taajuus hertseissä (Hz)"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "CPU:n määrä."
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Muistin (RAM) määrä tavuissa"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Tallennustila tavuissa"
 
@@ -456,267 +467,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "vaaditaan"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "vaihtoehtoinen"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Julkaisupäivä"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "End of life"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Koodinimi"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "Valmistajan ID"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Tuote"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "Tuotteen ID"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Luokka"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Näytä kentät"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 4b54412..f38fafb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
-"PO-Revision-Date: 2019-05-21 05:54+0000\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
+"PO-Revision-Date: 2019-08-26 09:36+0000\n"
 "Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/libosinfo/"
 "language/fr/)\n"
@@ -22,234 +22,240 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr "Types mimes valides pour l’avatar"
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr "Largeur demandée (en pixels) pour l’avatar"
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr "Hauteur demandée (en pixels) pour l’avatar"
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr "Indique si l’avatar supporte un canal alpha"
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Système d’exploitation"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Plate-forme de virtualisation"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Périphérique cible"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "Filtre de cible de lien de périphérique"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Identifiant unique"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "Architecture CPU"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr "Le format d’image"
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr "L’URL de cette image"
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Nom du paramètre"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "Politique de paramètre"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr "Association Paramètre/Valeur"
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "URI du modèle de script d’installation"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "Données pour le modèle de script d’installation"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "Nom de profil de script d’installation"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "Masque de format de clé produit"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr "Format attendu pour le chemin"
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr "Format attendu pour l’avatar"
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr "La méthode d'injection préférée"
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr "La source d'installation à utiliser"
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "Impossible de créer le contexte pour l’analyseur XML"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "Impossible de lire le modèle XSL"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "Impossible d’analyser le modèle XSL"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr "Impossible de créer le nœud XML « %s »"
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr "Impossible de créer le nœud XML « id »"
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr "Impossible d’ajouter l’enfant XML"
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr "Impossible de définir la racine XML"
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr "Impossible de positionner le nœud « media »"
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
-msgstr ""
+msgstr "Impossible de positionner le nœud « tree »"
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "Impossible de créer le contexte de transformation XSL"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "Impossible d’appliquer le contexte de transformation XSL"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "Impossible de convertir la sortie XSL en chaîne"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "Échec du chargement du modèle de script %s : "
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "Échec de l’application du modèle de script %s : "
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "Échec de l’application du modèle de script :"
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "Lister les types d’éléments"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr "Ensemble de nœuds (nodeset) attendu dans la requête XPath %s"
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "Valeur d’attribut de nœud texte attendu"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "Propriété identifiant de périphérique manquante"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "Propriété identifiant de lien de périphérique manquante"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "Propriété identifiant de mise à jour de produits manquante"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "Propriété identifiant de plate-forme manquante"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "Propriété identifiant de déploiement manquante"
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "Propriété identifiant d’OS de déploiement manquante"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "Propriété identifiant de plate-forme de déploiement manquante"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "Propriété identifiant d’OS manquante"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "Propriété identifiant de script d’installation manquante"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr "Propriété script d’installation de Media manquante"
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "Propriété script d’installation d’OS manquante"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "Élément racine incorrect"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "Impossible de créer le contexte pour l’analyseur"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "Élément racine XML manquant"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
@@ -258,7 +264,7 @@ msgstr ""
 "place. La prise en charge pour $OSINFO_DATA_DIR sera retirée dans une "
 "version future\n"
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
@@ -267,81 +273,82 @@ msgstr ""
 "%s est déprécié, veuillez utiliser %s à la place. La prise en charge pour %s "
 "sera retirée dans une version future\n"
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "URL vers ce média"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "L’ID de volume ISO9660 attendu"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "L’ID d’éditeur ISO9660 attendu"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "L’ID d’application ISO9660 attendu"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "L’ID système ISO9660 attendu"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "Le chemin vers l’image noyau"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr "Chemin vers l’image initrd"
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr "Le média contient un programme d’installation"
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "Le média peut démarrer directement sans installation"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "Nombre de redémarrages du programme d’installation"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr "Informations au sujet du système d’exploitation sur ce média"
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr "Langages gérés"
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr "Taille du volume ISO9660 attendue, en octets"
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 "Indique si le média doit être éjecté après les processus d’installation"
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 "Indique si le média soit être utilisé pour une installation en utilisant les "
 "scripts d'installation"
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "Le média d’installation n’est pas amorçable"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 "Échec de la lecture de l'enregistrement correspondant au dossier « %s » :"
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr "Aucun enregistrement n'a été trouvé pour le dossier « %s »"
@@ -351,6 +358,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "Impossible de lire le descripteur de volume additionnel :"
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "Le descripteur de volume additionnel a été tronqué"
 
@@ -359,10 +367,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "Impossible de lire le descripteur de volume principal :"
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "Le descripteur de volume principal a été tronqué"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "Métadonnées insuffisantes sur le média d’installation"
 
@@ -372,12 +382,13 @@ msgid "Failed to skip %d bytes"
 msgstr "Impossible de passer %d octets"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "Aucun descripteur de volume"
 
 #: osinfo/osinfo_media.c:1323
 msgid "Failed to open file: "
-msgstr ""
+msgstr "impossible d'ouvrir le fichier :"
 
 #: osinfo/osinfo_os.c:158
 msgid "Generic Family"
@@ -389,47 +400,47 @@ msgstr "Distribution générique"
 
 #: osinfo/osinfo_os.c:190
 msgid "Kernel URL Argument"
-msgstr ""
+msgstr "Paramètre d'URL du noyau"
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Nom"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "ID court"
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Fournisseur"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Version"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Nom de code"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "URI du logo"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "Fréquence de la CPU (Hz)"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Nombre de CPU"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Quantité de mémoire vive (RAM) en octets"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Quantité de stockage en octets"
 
@@ -451,204 +462,209 @@ msgstr "Si l'arbre possède treeinfo"
 
 #: osinfo/osinfo_tree.c:394
 msgid "The treeinfo family"
-msgstr ""
+msgstr "La famille treeinfo"
 
 #: osinfo/osinfo_tree.c:407
 msgid "The treeinfo variant"
-msgstr ""
+msgstr "La variante treeinfo"
 
 #: osinfo/osinfo_tree.c:420
 msgid "The treeinfo version"
-msgstr ""
+msgstr "La version treeinfo"
 
 #: osinfo/osinfo_tree.c:433
 msgid "The treeinfo architecture"
-msgstr ""
+msgstr "L'architecture treeinfo"
 
 #: osinfo/osinfo_tree.c:449
 msgid "Information about the operating system on this tree"
-msgstr ""
+msgstr "Informations au sujet du système d’exploitation sur cet arbre"
 
 #: osinfo/osinfo_tree.c:702
 msgid "Failed to load .treeinfo|treeinfo content: "
-msgstr ""
+msgstr "Impossible de charger le contenu .treeinfo|treeinfo : "
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "Impossible de traiter le fichier keyinfo : "
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr "Impossible de charger le fichier .treeinfo|treeinfo : "
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
-msgstr ""
+msgstr "Le protocol d'URL n'est pas pris en charge"
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr "Nom de cette variante"
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "Valeur invalide « %s »"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Format de sortie. Par défaut : plain"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr "Le type à utiliser. Par défaut : media"
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "media|tree."
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "Le média est amorçable.\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "Le média n’est pas amorçable.\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "Le média est un média d’installation pour « %s »\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "Le média est un média live pour « %s »\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr "Variantes de système d’exploitation disponibles sur ce média :\n"
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "L’arbre est un arbre d’installation pour « %s »\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr "Variantes de système d’exploitation disponibles sur l'arbre :\n"
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "- Détecter si le média est amorçable ainsi que le système d’exploitation et "
 "la distribution."
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr "Erreur lors de l’analyse des options de ligne de commande : %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "Erreur lors du chargement des données du système d’exploitation : %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "Erreur lors de l’analyse du média : %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "Erreur lors de l’analyse de l’arbre : %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "Configuration attendue du type clé=valeur"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "Profil de script d’installation"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "Répertoire de sortie du script d’installation"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "Le préfixe des fichiers de sortie"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr "La source d'installation à utiliser avec le script"
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "Définir les paramètres de configuration"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
-msgstr ""
+msgstr "Définir les paramètres de configuration"
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr "Lister les paramètres de configuration"
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr "Lister les profils de scripts d’installation"
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr "Lister les méthodes d’injection disponibles"
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr "Ne pas afficher les noms des fichiers de sortie"
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 "Pas de script d’installation pour le profil « %s » et le système "
 "d’exploitation « %s »"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "requis"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "optionnel"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 "Pas de script d’installation pour le profil « %s » et le système "
 "d’exploitation « %s »\n"
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "Impossible de créer le script d’installation : %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "- Créer un script d’installation du système d’exploitation"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr "Erreur lors de l’analyse des options : %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
@@ -656,92 +672,93 @@ msgstr ""
 "--list-profile, --list-config et --list-injection-methods ne peuvent pas "
 "être utilisés simultanément"
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Erreur lors de la recherche du système d’exploitation : %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Famille"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Distribution"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Date de publication"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "Fin de vie"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Nom de code"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "ID de fournisseur"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Produit"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "ID Produit"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Classe"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Bus"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "Nom de propriété inconnu %s"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "Erreur de syntaxe dans la condition, CLÉ=VALEUR est attendu"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Colonne de tri"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Afficher les champs"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "- Interroger la base de données des systèmes d’exploitation"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "Paramètre type de données manquant\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "Type demandé « %s » inconnu\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "Impossible de construire le filtre : %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "Impossible de définir la visiblité du champ :%s\n"
diff --git a/po/gl.po b/po/gl.po
index df6eeb1..fb6088c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Galician\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 0189bf1..9df002b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Gujarati\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index d4a3671..3ff57c6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 2 : 1;\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 766c6c8..06aecc8 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Hindi\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 2363310..e9eaed4 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Croatian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 489b60b..38e3330 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Hungarian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ia.po b/po/ia.po
index e5a3af8..a5f90d5 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Interlingua\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index bb05008..e06dcec 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Indonesian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ilo.po b/po/ilo.po
index 346ef3f..65e4247 100644
--- a/po/ilo.po
+++ b/po/ilo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Iloko\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 85b4e41..44dae12 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Icelandic\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n%10!=1 || n%100==11)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index d3f0742..486e5c1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,10 +2,10 @@
 # Milo Casagrande <milo@milo.name>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
-"PO-Revision-Date: 2019-03-29 08:32+0000\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
+"PO-Revision-Date: 2019-08-09 07:08+0000\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian\n"
 "Language: it\n"
@@ -15,234 +15,240 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr "I tipi mime consentiti per l'immagine"
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr "La larghezza richiesta (in pixel) per l'immagine"
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr "L'altezza richiesta (in pixel) per l'immagine"
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr "Indica se il canale alpha è supportato nell'immagine"
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Sistema operativo"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Piattaforma di virtualizzazione"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Dispositivo obiettivo"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "Filtro collegamento dispositivo"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Identificatore univoco"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "Architettura CPU"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr "Il formato dell'immagine"
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr "L'URL di questa immagine"
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Nome parametro"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "Politica parametro"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr "Mappatura valore parametro"
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "URI per il modello dello script d'installazione"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "Dati per il modello dello script d'installazione"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "Nome profilo script d'installazione"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "Maschera del formato della chiave prodotto"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr "Formato percorso atteso"
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr "Formato immagine atteso"
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr "Il metodo di inserimento preferito"
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr "La sorgente d'installazione da usare"
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "Impossibile create il contesto dell'analizzatore XML"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "Impossibile leggere il modello XSL"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "Impossibile analizzare il modello XSL"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr "Impossibile creare il nodo XML «%s»"
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr "Impossibile creare il nodo XML «id»"
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr "Impossibile aggiungere un figlio XML"
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr "Impossibile impostare la radice XML"
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr "Impossibile impostare il nodo «media»"
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
-msgstr ""
+msgstr "Impossibile impostare il nodo «tree»"
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "Impossibile creare il contesto di trasformazione XSL"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "Impossibile applicare il contesto di trasformazione XSL"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "Impossibile convertire l'output XSL in stringa"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "Caricamento del modello di script %s non riuscito: "
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "Applicazione del modello di script %s non riuscita: "
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "Applicazione del modello di script non riuscita: "
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "Elenca il tipo dell'elemento"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr "Atteso un nodeset nell'interrogazione XPath %s"
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "Atteso un nodo testuale"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "Proprietà id del dispositivo mancante"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "Proprietà id collegamento del dispositivo mancante"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "Proprietà id degli aggiornamenti mancante"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "Proprietà id della piattaforma mancante"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "Proprietà id di distribuzione mancante"
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "Proprietà id SO di distribuzione mancante"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "Proprietà id piattaforma di distribuzione mancante"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "Proprietà id SO mancante"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "Proprietà id script d'installazione mancante"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr "Proprietà script d'installazione Media mancante"
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "Proprietà script d'installazione SO mancante"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "Elemento radice non corretto"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "Impossibile creare il contesto dell'analizzatore"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "Elemento radice XML mancante"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
@@ -250,7 +256,7 @@ msgstr ""
 "$OSINFO_DATA_DIR è deprecato, usare $OSINFO_SYSTEM_DIR al suo posto; il "
 "supporto per $OSINFO_DATA_DIR verrà rimosso in una versione futura\n"
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
@@ -259,80 +265,81 @@ msgstr ""
 "%s è deprecato, usare %s al suo posto; il supporto per %s verrà rimosso in "
 "un versione futura\n"
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "L'URL di questo supporto"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "L'ID di volume ISO9660 atteso"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "L'ID dell'editore ISO9660 atteso"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "L'ID applicazione ISO9660 atteso"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "L'ID di sistema ISO9660 atteso"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "Il percorso all'immagine kernel"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr "Il percorso all'immagine initrd"
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr "Il supporto fornisce un sistema d'installazione"
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "È possibile avviare il supporto senza installazione"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "Numero di riavvii del sistema d'installazione"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr "Informazioni riguardo al sistema operativo su questo supporto"
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr "Lingue supportate"
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr "Attesa dimensione del volume ISO9660 in byte"
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 "Indica se il supporto debba essere espulso al termine dell'installazione"
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 "Indica se il supporto deve essere usato per l'installazione utilizzando "
 "script d'installazione"
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "Il supporto d'installazione non è avviabile"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr "Lettura della voce extent per la directory «%s» non riuscita: "
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr "Manca la voce extent per la directory «%s»"
@@ -342,6 +349,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "Lettura del descrittore del volume supplementare non riuscita: "
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "Il descrittore del volume supplementare era troncato"
 
@@ -350,10 +358,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "Lettura del descrittore del volume primario non riuscita: "
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "Il descrittore del volume primario era troncato"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "Metadati insufficienti sul supporto d'installazione"
 
@@ -363,12 +373,13 @@ msgid "Failed to skip %d bytes"
 msgstr "Salto di %d byte non riuscito"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "Nessun descrittore di volume"
 
 #: osinfo/osinfo_media.c:1323
 msgid "Failed to open file: "
-msgstr ""
+msgstr "Apertura del file non riuscita:"
 
 #: osinfo/osinfo_os.c:158
 msgid "Generic Family"
@@ -380,47 +391,47 @@ msgstr "Distro generica"
 
 #: osinfo/osinfo_os.c:190
 msgid "Kernel URL Argument"
-msgstr ""
+msgstr "Parametro URL kernel"
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Nome"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "ID breve"
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Produttore"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Versione"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Nome in codice"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "URI del logo"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "Frequenza CPU in Hz (Hertz)"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Numero di CPU"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Quantità di RAM (Random Access Memory) in byte"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Quantità di spazio di archiviazione in byte"
 
@@ -442,199 +453,204 @@ msgstr "Indica se l'albero dispone di treeinfo"
 
 #: osinfo/osinfo_tree.c:394
 msgid "The treeinfo family"
-msgstr ""
+msgstr "La famiglia di treeinfo"
 
 #: osinfo/osinfo_tree.c:407
 msgid "The treeinfo variant"
-msgstr ""
+msgstr "La variante di treeinfo"
 
 #: osinfo/osinfo_tree.c:420
 msgid "The treeinfo version"
-msgstr ""
+msgstr "La versione di treeinfo"
 
 #: osinfo/osinfo_tree.c:433
 msgid "The treeinfo architecture"
-msgstr ""
+msgstr "L'architettura di treeinfo"
 
 #: osinfo/osinfo_tree.c:449
 msgid "Information about the operating system on this tree"
-msgstr ""
+msgstr "Informazioni riguardo al sistema operativo su questo albero"
 
 #: osinfo/osinfo_tree.c:702
 msgid "Failed to load .treeinfo|treeinfo content: "
-msgstr ""
+msgstr "Caricamento dei contenuti .treeinfo|treeinfo non riuscito:"
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "Elaborazione del file keyinfo non riuscita:"
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
-msgstr ""
+msgstr "Caricamento del file .treeinfo|treeinfo non riuscito:"
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
-msgstr ""
+msgstr "Protocollo URL non supportato"
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr "Il nome di questa variante"
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "Valore «%s» non valido"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Formato di uscita, predefinito: plain"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "plain|env"
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
-msgstr ""
+msgstr "Il tipo da usare, predefinito: media"
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "media|tree"
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "Il supporto è avviabile.\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "Il supporto non può essere avviato.\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "Il supporto è un sistema d'installazione per il SO «%s»\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "Il supporto è un supporto live per il SO «%s»\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr "Disponibili varianti del SO sul supporto:\n"
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "L'albero è un sistema d'installazione per il SO «%s»\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
-msgstr ""
+msgstr "Varianti SO disponibile sull'albero\n"
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "- Rileva se un supporto è avviabile e il SO o la distribuzione disponibile"
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr "Errore nell'analizzare le opzioni a riga di comando: %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "Errore nel caricare i dati del SO: %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "Errore nell'analizzare il supporto: %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "Errore nell'analizzare l'albero d'installazione: %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "Attesa una configurazione chiave=valore"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "Profilo dello script d'installazione"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "Directory di output dello script d'installazione"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "Il prefisso del file di output"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr "La sorgente di installazione da usare con lo script"
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "Imposta un parametro di configurazione"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
-msgstr ""
+msgstr "Imposta parametri di configurazione"
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr "Elenca i parametri di configurazione"
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr "Elenca i profili degli script d'installazione"
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr "Elenca i metodi di aggiunta supportati"
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr "Non mostrare i nomi file di output"
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr "Nessuno script d'installazione per il profilo «%s» e SO «%s»"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "richiesto"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "opzionale"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr "Nessuno script d'installazione per il profilo «%s» e SO «%s»\n"
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "Impossibile generare lo script d'installazione: %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "- Genera uno script d'installazione"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr "Errore nell'analizzare le opzioni: %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
@@ -642,92 +658,93 @@ msgstr ""
 "Solo uno di --list-profile, --list-config o --list-injection-methods può "
 "essere utilizzato"
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Errore nel trovare il SO: %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Famiglia"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Distro"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Data rilascio"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "Termine supporto"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Nome in codice"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "ID produttore"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Prodotto"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "ID prodotto"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Classe"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Bus"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "Proprietà %s sconosciuta"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "Errore di sintassi nella condizione, atteso CHIAVE=VALORE"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Ordina colonna"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Visualizza campi"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "- Interroga il database delle informazioni sul SO"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "Manca il parametro del tipo di dati\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "Richiesto un tipo «%s» sconosciuto\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "Impossibile creare il filtro: %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "Impossibile impostare la visibilità del campo: %s\n"
diff --git a/po/ja.po b/po/ja.po
index ae13d1e..f99d3b6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,9 +6,9 @@
 # Tomoyuki KATO <tomo@dream.daynight.jp>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2015-02-20 07:44+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/libosinfo/"
@@ -20,317 +20,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "オペレーティングシステム"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "仮想化プラットフォーム"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "対象デバイス"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "デバイス・リンク・ターゲット・フィルター"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "一意な識別子"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "CPU アーキテクチャー"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "パラメーター名"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "パラメーター・ポリシー"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "インストールスクリプトのテンプレートの URI"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "インストールスクリプトのテンプレートのデータ"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "インストールスクリプトのプロファイル名"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "プロダクトキーの形式マスク"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "XML パーサーのコンテキストを作成できません"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "XSL テンプレートを読み込めません"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "XSL テンプレートを構文解析できません"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "XSL 変換のコンテキストを作成できません"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "XSL 変換のコンテキストを適用できません"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "XSL 出力を文字列に変換できません"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "スクリプトのテンプレート %s の読み込みに失敗しました: "
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "スクリプトのテンプレート %s の適用に失敗しました: "
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "スクリプトのテンプレートの適用に失敗しました: "
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "要素の形式の一覧表示"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "text node 属性値が期待されます"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "デバイス ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "デバイスリンク ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "プロダクトアップグレード ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "プラットフォーム ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "デプロイメント ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "デプロイメント OS ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "デプロイメントプラットフォーム ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "OS ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "インストールスクリプト ID プロパティがありません"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "OS インストールスクリプトのプロパティがありません"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "不正なルート要素"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "パーサーのコンテキストを構築できません"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "ルート XML 要素がありません"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "このメディアへの URL"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "予期される ISO9660 ボリューム ID"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "予期される ISO9660 発行者 ID"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "予期される ISO9660 アプリケーション ID"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "予期される ISO9660 システム ID"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "カーネルイメージへのパス"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "直接 w/o インストールをブートできるメディア"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "インストーラーの再起動する回数"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "インストールメディアがブート可能ではありません"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -340,6 +347,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "補助ボリューム記述子の読み込みに失敗しました: "
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "補助ボリューム記述子が削除されました"
 
@@ -348,10 +356,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "プライマリボリューム記述子の読み込みに失敗しました: "
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "プライマリボリューム記述子が削除されました"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "インストールメディアのメタデータが不十分です"
 
@@ -361,6 +371,7 @@ msgid "Failed to skip %d bytes"
 msgstr "%d バイトのスキップに失敗しました"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "ボリューム記述子がありません"
 
@@ -380,45 +391,45 @@ msgstr "汎用ディストロ"
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "名前"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "短縮 ID"
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "ベンダー"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "バージョン"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "コード名"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "ロゴの URI"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "ヘルツ (Hz) 単位の CPU 周波数"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "CPU 数"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "バイト単位のメモリー (RAM) 量"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "バイト単位のストレージ容量"
 
@@ -462,269 +473,275 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "keyinfo ファイルの処理に失敗しました: "
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "無効な値 '%s'"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "出力形式。初期値: plain"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "plain|env 。"
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "メディア|ツリー."
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "メディアがブート可能です。\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "メディアがブート不可能です。\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "メディアが OS '%s' のインストーラーです。\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "メディアが OS '%s' の Live メディアです。\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "ツリーが OS '%s' のインストーラーです。\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "- メディアがブート可能であること、および適切な OS とディストリビューションで"
 "あることを検知します。"
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr "コマンドラインオプションの構文解析中にエラーが発生しました: %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "OS データの読み込み中にエラーが発生しました: %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "メディアの解析中にエラーが発生しました: %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "インストーラー・ツリーの解析中にエラーが発生しました: %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "予期される設定 key=value"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "インストールスクリプトのプロファイル"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "インストールスクリプトの出力ディレクトリ"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "出力ファイルのプレフィックス"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "設定パラメーターを設定します"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "インストールスクリプトを生成できません: %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "- OS インストール・スクリプトを生成します"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr "オプションの構文解析中にエラーが発生しました: %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "OS の検索中にエラーが発生しました: %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "ファミリー"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "ディストロ"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "リリース日"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "終了"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "コード名"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "製造者 ID"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "製品"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "製品 ID"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "クラス"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "バス"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "未知のプロパティ名 %s"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "条件に構文エラーがあります、KEY=VALUE が期待されます"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "列の並び替え"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "項目の表示"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "- OS 情報データベースに問い合わせる"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "データ形式パラメーターがありません\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "未知の形式 '%s' が要求されました\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "フィルターを作成できません: %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "項目の可視性を設定できません: %s\n"
diff --git a/po/ka.po b/po/ka.po
index 4b2fdb1..080ee4d 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Georgian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/kk.po b/po/kk.po
index 7dc6f1e..5759628 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Kazakh\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index 4861a7b..d7afb21 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Khmer\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index fb0b4a3..4c6ac8a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Kannada\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index e3199e7..1a46eb7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Korean\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/kw.po b/po/kw.po
index 594f9b6..b0e6136 100644
--- a/po/kw.po
+++ b/po/kw.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish\n"
@@ -19,317 +19,324 @@ msgstr ""
 "3\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/kw@kkcor.po b/po/kw@kkcor.po
index df780e4..edf9fa5 100644
--- a/po/kw@kkcor.po
+++ b/po/kw@kkcor.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish (Common Orthography)\n"
@@ -19,317 +19,324 @@ msgstr ""
 "3\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/kw@uccor.po b/po/kw@uccor.po
index af51b16..52201d4 100644
--- a/po/kw@uccor.po
+++ b/po/kw@uccor.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish (Unified Orthography)\n"
@@ -19,317 +19,324 @@ msgstr ""
 "3\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/kw_GB.po b/po/kw_GB.po
index 5c59216..518f05c 100644
--- a/po/kw_GB.po
+++ b/po/kw_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Cornish (United Kingdom)\n"
@@ -19,317 +19,324 @@ msgstr ""
 "3\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ky.po b/po/ky.po
index d6b6b51..3875808 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Kirghiz\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 6ed584e..e4c3d41 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2018-09-05 09:06+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Lithuanian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 9487023..bcb37e4 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Latvian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "2)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/mai.po b/po/mai.po
index 704c5ce..80fb0c8 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Maithili\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 9ecf268..e177275 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Macedonian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 2536a2e..93d738c 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Malayalam\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/mn.po b/po/mn.po
index 76a3e48..636dbfe 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Mongolian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 46395f9..6ed9eeb 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Marathi\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 632afd2..56ccc5d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Malay\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 4af9239..a49600c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/nds.po b/po/nds.po
index 111a262..03f0a85 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Low German\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index a6e5292..f135fe5 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Nepali\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 4b40531..84dfe7d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 386a76f..b4e1c68 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Nynorsk\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/nso.po b/po/nso.po
index da2ccc0..7ffdba6 100644
--- a/po/nso.po
+++ b/po/nso.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Northern Sotho\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/or.po b/po/or.po
index 9cb6bcf..aec56d8 100644
--- a/po/or.po
+++ b/po/or.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Oriya\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index bd3aaef..7388edf 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Punjabi\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index f5d6b7c..6f90f7c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,10 +10,10 @@
 # Piotr Drąg <piotrdrag@gmail.com>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
-"PO-Revision-Date: 2019-05-06 04:36+0000\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
+"PO-Revision-Date: 2019-07-27 12:37+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/libosinfo/"
 "language/pl/)\n"
@@ -25,234 +25,240 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr "Dozwolone typy MIME dla awatara"
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr "Wymagana szerokość (w pikselach) awatara"
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr "Wymagana wysokość (w pikselach) awatara."
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr "Czy kanał alfa jest obsługiwany w awatarze."
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "System operacyjny"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Platforma wirtualizacji"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Urządzenie docelowe"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "Filtr celu dowiązania urządzenia"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Unikalny identyfikator"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "Architektura procesora"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr "Format obrazu"
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr "Adres URL do tego obrazu"
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Nazwa parametru"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "Polityka parametru"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr "Mapowanie wartości parametru"
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "Adres URI do szablonu skryptu instalacji"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "Dane dla szablonu skryptu instalacji"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "Nazwa profilu skryptu instalacji"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "Maska formatu klucza produktu"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr "Oczekiwany format ścieżki"
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr "Oczekiwany format awatara"
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr "Preferowana metoda wprowadzania"
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr "Używane źródło instalacji"
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "Nie można utworzyć kontekstu parsera XML"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "Nie można odczytać szablonu XSL"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "Nie można przetworzyć szablonu XSL"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr "Nie można utworzyć węzła XML „%s”"
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr "Nie można utworzyć węzła XML „id”"
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr "Nie można dodać elementu potomnego XML"
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr "Nie można ustawić głównego elementu XML"
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr "Nie można ustawić węzła „media”"
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
-msgstr ""
+msgstr "Nie można ustawić węzła „tree”"
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "Nie można utworzyć kontekstu przekształcenia XSL"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "Nie można zastosować kontekstu przekształcenia XSL"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "Nie można przekonwertować wyjścia XSL na ciąg"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "Wczytanie szablonu skryptu %s się nie powiodło: "
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "Zastosowanie szablonu skryptu %s się nie powiodło: "
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "Zastosowanie szablonu skryptu się nie powiodło: "
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "Typ elementu listy"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr "Oczekiwano nodeset w zapytaniu XPath %s"
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "Oczekiwano wartości atrybutu węzła tekstu"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "Brak właściwości identyfikatora urządzenia"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "Brak właściwości identyfikatora dowiązania urządzenia"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "Brak właściwości identyfikatora aktualizacji produktu"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "Brak właściwości identyfikatora platformy"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "Brak właściwości identyfikatora "
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "Brak właściwości identyfikatora wdrożenia"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "Brak właściwości identyfikatora platformy wdrożenia"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "Brak właściwości identyfikatora systemu operacyjnego"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "Brak właściwości identyfikatora w skrypcie instalacji"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr "Brak właściwości nośnika w skrypcie instalacji"
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "Brak właściwości systemu operacyjnego w skrypcie instalacji"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "Niepoprawny główny element"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "Nie można skonstruować kontekstu parsera"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "Brak głównego elementu XML"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
@@ -260,7 +266,7 @@ msgstr ""
 "$OSINFO_DATA_DIR jest przestarzałe, należy używać $OSINFO_SYSTEM_DIR zamiast "
 "tego. Obsługa $OSINFO_DATA_DIR zostanie usunięta w przyszłym wydaniu\n"
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
@@ -269,77 +275,78 @@ msgstr ""
 "%s jest przestarzałe, należy używać %s zamiast tego. Obsługa %s zostanie "
 "usunięta w przyszłym wydaniu\n"
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "Adres URL do tego nośnika"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "Oczekiwany identyfikator woluminu ISO9660"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "Oczekiwany identyfikator wydawcy ISO9660"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "Oczekiwany identyfikator aplikacji ISO9660"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "Oczekiwany identyfikator systemu ISO9660"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "Ścieżka do obrazu jądra"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr "Ścieżka do obrazy initrd"
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr "Nośnik dostarcza instalator"
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "Nośnik może być uruchamiany bezpośrednio bez instalacji"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "Liczba ponownych uruchomień instalatora"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr "Informacje o systemie operacyjnym na tym nośniku"
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr "Obsługiwane języki"
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr "Oczekiwany rozmiar woluminu ISO9660 w bajtach"
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr "Czy nośnik ma być wysunięty po instalacji"
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr "Czy nośnik ma być używany do instalacji za pomocą skryptów instalacji"
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "Nośnik instalacji nie jest startowy"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr "Odczytanie obszaru wpisu katalogu „%s” się nie powiodło: "
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr "Brak obszaru wpisu katalogu „%s”"
@@ -349,6 +356,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "Odczytanie dodatkowego deskryptora woluminu się nie powiodło: "
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "Dodatkowy deskryptor woluminu został skrócony"
 
@@ -357,10 +365,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "Odczytanie głównego deskryptora woluminu się nie powiodło: "
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "Główny deskryptor woluminu został skrócony"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "Niewystarczające metadane na nośniku instalacji"
 
@@ -370,12 +380,13 @@ msgid "Failed to skip %d bytes"
 msgstr "Pominięcie %d B się nie powiodło"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "Brak deskryptorów woluminu"
 
 #: osinfo/osinfo_media.c:1323
 msgid "Failed to open file: "
-msgstr ""
+msgstr "Otwarcie pliku się nie powiodło: "
 
 #: osinfo/osinfo_os.c:158
 msgid "Generic Family"
@@ -387,47 +398,47 @@ msgstr "Ogólna dystrybucja"
 
 #: osinfo/osinfo_os.c:190
 msgid "Kernel URL Argument"
-msgstr ""
+msgstr "Parametr adresu URL jądra"
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Nazwa"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "Krótki identyfikator"
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Producent"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Wersja"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Nazwa kodowa"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "Adres URI do logo"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "Częstotliwość procesora w hercach (Hz)"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Liczba procesorów"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Ilość pamięci swobodnego dostępu (RAM) w bajtach"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Ilość przestrzeni pamięci masowej w bajtach"
 
@@ -449,200 +460,205 @@ msgstr "Czy drzewo ma treeinfo"
 
 #: osinfo/osinfo_tree.c:394
 msgid "The treeinfo family"
-msgstr ""
+msgstr "Rodzina treeinfo"
 
 #: osinfo/osinfo_tree.c:407
 msgid "The treeinfo variant"
-msgstr ""
+msgstr "Wariant treeinfo"
 
 #: osinfo/osinfo_tree.c:420
 msgid "The treeinfo version"
-msgstr ""
+msgstr "Wersja treeinfo"
 
 #: osinfo/osinfo_tree.c:433
 msgid "The treeinfo architecture"
-msgstr ""
+msgstr "Architektura treeinfo"
 
 #: osinfo/osinfo_tree.c:449
 msgid "Information about the operating system on this tree"
-msgstr ""
+msgstr "Informacje o systemie operacyjnym w tym drzewie"
 
 #: osinfo/osinfo_tree.c:702
 msgid "Failed to load .treeinfo|treeinfo content: "
-msgstr ""
+msgstr "Wczytanie treści .treeinfo|treeinfo się nie powiodło: "
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "Przetworzenie pliku keyinfo się nie powiodło: "
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr "Wczytanie pliku .treeinfo|treeinfo się nie powiodło: "
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
-msgstr ""
+msgstr "Protokół adresu URL jest nieobsługiwany"
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr "Nazwa tego wariantu"
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "Nieprawidłowa wartość „%s”"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Format wyjściowy. Domyślny: plain"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr "Używany typ. Domyślny: media"
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "media|tree."
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "Nośnik jest startowy.\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "Nośnik nie jest startowy.\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "Nośnik jest instalatorem dla systemu operacyjnego „%s”\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "Nośnik jest nośnikiem live dla systemu operacyjnego „%s”\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr "Dostępne warianty systemu operacyjnego na tym nośniku:\n"
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "Drzewo jest instalatorem dla systemu operacyjnego „%s”\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr "Dostępne warianty systemu operacyjnego w drzewie:\n"
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "— wykrywa odpowiedni system operacyjny i dystrybucję oraz czy nośnik jest "
 "startowy."
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr "Błąd podczas przetwarzania opcji wiersza poleceń: %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "Błąd podczas wczytywania danych systemu operacyjnego: %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "Błąd podczas przetwarzania nośnika: %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "Błąd podczas przetwarzania drzewa instalatora: %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "Oczekiwano klucz=wartość konfiguracji"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "Profil skryptu instalacji"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "Katalog wyjściowy skryptu instalacji"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "Przedrostek nazwy pliku wyjściowego"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr "Źródło instalacji używane za pomocą skryptu"
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "Ustawia parametr konfiguracji"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
-msgstr ""
+msgstr "Ustawia parametry konfiguracji"
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr "Wyświetla listę parametrów konfiguracji"
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr "Wyświetla listę profili skryptów instalacji"
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr "Wyświetla listę obsługiwanych metod wprowadzania"
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr "Bez wyświetlania wyjściowych nazw plików"
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr "Brak skryptu instalacji dla profilu „%s” i systemu operacyjnego „%s”"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "wymagane"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "opcjonalne"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr "Brak skryptu instalacji dla profilu „%s” i systemu operacyjnego „%s”\n"
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "Nie można utworzyć skryptu instalacji: %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "— tworzy skrypt instalacji systemu operacyjnego"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr "Błąd podczas przetwarzania opcji: %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
@@ -650,92 +666,93 @@ msgstr ""
 "Tylko jeden parametr z --list-profile, --list-config i --list-injection-"
 "methods może zostać zażądany"
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Błąd podczas wyszukiwania systemu operacyjnego: %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Rodzina"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Dystrybucja"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Data wydania"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "Koniec cyklu wydawniczego"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Nazwa kodowa"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "Identyfikator"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "Identyfikator producenta"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Produkt"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "Identyfikator produktu"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Klasa"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Magistrala"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "Nieznana nazwa właściwości %s"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "Błąd składni w warunku, oczekiwanie KLUCZ=WARTOŚĆ"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Porządkowanie kolumn"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Wyświetlanie pól"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "— odpytuje bazę danych informacji o systemach operacyjnych"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "Brak parametru typu danych\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "Zażądano nieznanego typu „%s”\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "Nie można skonstruować filtru: %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "Nie można ustawić widoczności pola: %s\n"
diff --git a/po/pt.po b/po/pt.po
index b9ca427..9a099bb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Portuguese\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 84c84e3..436a581 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,9 +1,9 @@
 # Marco Aurélio Krause <ouesten@me.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: 2015-10-15 11:06+0000\n"
 "Last-Translator: Marco Aurélio Krause <ouesten@me.com>\n"
 "Language-Team: Portuguese (Brazil)\n"
@@ -14,317 +14,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -334,6 +341,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -342,10 +350,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -355,6 +365,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -374,45 +385,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Nome"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Fabricante"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Versão"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Nome código"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "URI do logo"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Numero de CPUs"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -456,267 +467,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "Requerido"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "Opcional"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Família"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Distro"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Data de lançamento"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "ID"
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Produto"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "ID do produto"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Classe"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Bus"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index ff9bbf6..f70456c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Romanian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "20)) ? 1 : 2);\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index a20986e..f1fa887 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/si.po b/po/si.po
index f820430..3f759d9 100644
--- a/po/si.po
+++ b/po/si.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Sinhala\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 7fe3f9a..519b6a7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Slovak\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 51c0dd8..d0851d6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Slovenian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%100==4 ? 3 : 0)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index e6f2e9e..aecc493 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Albanian\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 7349ffd..08eb272 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Serbian\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 49278e8..dc0fb7f 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Serbian (LATIN)\n"
@@ -19,317 +19,324 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -339,6 +346,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -347,10 +355,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -360,6 +370,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -379,45 +390,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -461,267 +472,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index aadce28..3595ee7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Swedish\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 8594cdc..718ccb6 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Tamil\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 6767bc9..caec1d5 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Telugu\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/tg.po b/po/tg.po
index 7c68790..b53ce8f 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Tajik\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index b0a4241..2b0cbf7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Thai\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 8c561c7..33003bc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Turkish\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n>1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/tw.po b/po/tw.po
index e52a632..f573ea9 100644
--- a/po/tw.po
+++ b/po/tw.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Twi\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index fdf1104..bb10865 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,10 +10,10 @@
 # Yuri Chornoivan <yurchor@ukr.net>, 2019. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: libosinfo 1.6.0\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
-"PO-Revision-Date: 2019-05-08 05:27+0000\n"
+"Project-Id-Version: libosinfo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
+"PO-Revision-Date: 2019-07-28 04:36+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/libosinfo/"
 "language/uk/)\n"
@@ -25,234 +25,240 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Zanata 4.6.2\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr "Дозволені типи MIME для аватару"
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr "Потрібна ширина (у пікселях) аватару"
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr "Потрібна висота (у пікселях) аватару."
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr "Визначає, чи передбачено підтримку каналу прозорості у аватарі."
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr "Операційна система"
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr "Платформа віртуалізації"
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr "Пристрій призначення"
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr "Фільтр призначення посилання на пристрій"
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr "Унікальний ідентифікатор"
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr "Архітектура процесора"
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr "Формат образу"
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr "Адреса образу"
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr "Назва параметра"
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr "Правила щодо параметра"
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr "Прив’язка значення параметра"
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr "Адреса шаблона скрипту для встановлення"
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr "Дані для шаблону скрипту для встановлення"
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr "Назва профілю скрипту для встановлення"
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr "Маска формату ключа продукту"
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr "Очікуваний формат шляху"
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr "Очікуваний формат аватару"
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr "Бажаний спосіб вставляння"
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr "Джерело даних для встановлення, яке буде використано"
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr "Не вдалося створити контекст обробки XML"
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr "Не вдалося прочитати шаблон XSL"
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr "Не вдалося обробити шаблон XSL"
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr "Не вдалося створити вузол XML «%s»"
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr "Не вдалося створити вузол XML «id»"
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr "Не вдалося додати дочірній об'єкт XML"
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr "Не вдалося встановити кореневий об'єкт XML"
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr "Не вдалося встановити вузол «media»"
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
-msgstr ""
+msgstr "Не вдалося встановити вузол «tree»"
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr "Не вдалося створити контекст перетворення XSL"
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr "Не вдалося застосувати контекст перетворення XSL"
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr "Не вдалося перетворити виведені XSL дані на рядок"
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr "Не вдалося завантажити шаблон скрипту %s: "
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr "Не вдалося застосувати шаблон скрипту %s: "
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr "Не вдалося застосувати шаблон скрипту: "
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr "Тип списку елементів"
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr "Очікуваний набір вузлів у запиті XPath %s"
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr "Мало бути вказано значення атрибута текстового вузла"
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr "Не вистачає властивості ідентифікатора пристрою"
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr "Не вистачає властивості прив’язки до пристрою"
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr "Не вистачає властивості ідентифікатора оновлення продукту"
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr "Не вистачає властивості ідентифікатора платформи"
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr "Не вистачає властивості ідентифікатора розгортання"
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr "Не вистачає властивості ідентифікатора ОС розгортання"
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr "Не вистачає властивості платформи розгортання"
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr "Не вистачає властивості ідентифікатора ОС"
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr "Не вистачає властивості ідентифікатора скрипту встановлення"
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr "Не вказано властивості скрипту встановлення носія"
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr "Не вистачає властивості скрипту встановлення"
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr "Помилковий кореневий елемент"
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr "Не вдалося побудувати контекст обробки"
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr "Не вистачає кореневого елемента XML"
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
@@ -261,7 +267,7 @@ msgstr ""
 "нього $OSINFO_SYSTEM_DIR. Підтримку $OSINFO_DATA_DIR буде вилучено у "
 "наступному випуску\n"
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
@@ -270,80 +276,81 @@ msgstr ""
 "%s вважається застарілим, будь ласка, використовуйте замість нього %s. "
 "Підтримку %s буде вилучено у наступному випуску\n"
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr "Адреса цього носія"
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr "Очікуваний ідентифікатор тому ISO9660"
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr "Очікуваний ідентифікатор оприлюднювача ISO9660"
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr "Очікуваний ідентифікатор програми ISO9660"
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr "Очікуваний ідентифікатор системи ISO9660"
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr "Шлях до образу ядра"
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr "Шлях до образу initrd"
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr "На носії є встановлювач"
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr "Безпосереднє завантаження з носія без встановлення неможливе"
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr "Кількість перезавантажень засобом для встановлення"
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr "Інформація щодо операційної системи на цьому носії"
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr "Підтримувані мови"
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr "Розмір тому мало бути вказано у форматі ISO9660 у байтах"
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 "Визначає, чи слід виштовхувати носій з даними після виконання встановлення"
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 "Визначає, чи слід використовувати носій даних для встановлення за допомогою "
 "скриптів для встановлення"
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr "Носій для встановлення непридатний до завантаження"
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr "Не вдалося прочитати розширення запису каталогу «%s»: "
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr "Немає розширення запису каталогу «%s»"
@@ -353,6 +360,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr "Не вдалося прочитати дескриптор допоміжного тому: "
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr "Дескриптор допоміжного тому було обрізано"
 
@@ -361,10 +369,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr "Не вдалося прочитати дескриптор основного тому: "
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr "Дескриптор основного тому було обрізано"
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr "Недостатньо метаданих на носії для встановлення"
 
@@ -374,12 +384,13 @@ msgid "Failed to skip %d bytes"
 msgstr "Не вдалося пропустити %d байтів"
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr "Немає дескрипторів тому"
 
 #: osinfo/osinfo_media.c:1323
 msgid "Failed to open file: "
-msgstr ""
+msgstr "Не вдалося відкрити файл: "
 
 #: osinfo/osinfo_os.c:158
 msgid "Generic Family"
@@ -391,47 +402,47 @@ msgstr "Загальний дистрибутив"
 
 #: osinfo/osinfo_os.c:190
 msgid "Kernel URL Argument"
-msgstr ""
+msgstr "Аргумент адреси ядра"
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr "Назва"
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr "Короткий ід."
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr "Виробник"
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr "Версія"
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr "Кодова назва"
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr "Адреса логотипу"
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr "Частота процесора у Гц"
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr "Кількість процесорів"
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr "Об’єм оперативної пам’яті (RAM) у байтах"
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr "Об’єм сховища даних у байтах"
 
@@ -453,200 +464,205 @@ msgstr "Визначає, чи є у ієрархії treeinfo"
 
 #: osinfo/osinfo_tree.c:394
 msgid "The treeinfo family"
-msgstr ""
+msgstr "Сімейство treeinfo"
 
 #: osinfo/osinfo_tree.c:407
 msgid "The treeinfo variant"
-msgstr ""
+msgstr "Варіант treeinfo"
 
 #: osinfo/osinfo_tree.c:420
 msgid "The treeinfo version"
-msgstr ""
+msgstr "Версія treeinfo"
 
 #: osinfo/osinfo_tree.c:433
 msgid "The treeinfo architecture"
-msgstr ""
+msgstr "Архітектура treeinfo"
 
 #: osinfo/osinfo_tree.c:449
 msgid "Information about the operating system on this tree"
-msgstr ""
+msgstr "Інформація щодо операційної системи у цій ієрархії"
 
 #: osinfo/osinfo_tree.c:702
 msgid "Failed to load .treeinfo|treeinfo content: "
-msgstr ""
+msgstr "Не вдалося завантажити вміст .treeinfo|treeinfo: "
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr "Не вдалося обробити файл keyinfo: "
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr "Не вдалося завантажити файл .treeinfo|treeinfo: "
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
-msgstr ""
+msgstr "Підтримки протоколу URL не передбачено"
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr "Назва цього варіанта"
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr "Некоректне значення, «%s»"
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr "Формат виведення даних. Типове значення: plain (без форматування)"
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
-msgstr "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
+msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr "Тип, який слід використати. Типове значення: media"
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr "media|tree."
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr "Носій є придатним до завантаження.\n"
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr "Носій є непридатним до завантаження.\n"
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
-msgstr "Носій є засобом встановлення для ОС «%s»\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
-msgstr "Носій є образом портативної ОС «%s»\n"
+msgid "Media is live media for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr "Доступні варіанти ОС на носії.\n"
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
-msgstr "Дерево каталогів є засобом встановлення ОС «%s»\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
+msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr "Доступні варіанти ОС у ієрархії:\n"
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 "- Визначення того, чи є носій придатним до завантаження, а також відповідної "
 "ОС і дистрибутива."
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr "Помилка під час спроби обробити параметри командного рядка: %s\n"
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr "Помилка під час спроби завантаження даних ОС: %s\n"
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr "Помилка під час обробки носія: %s\n"
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr "Помилка під час обробки дерева каталогів засобу встановлення: %s\n"
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr "Налаштування мало бути визначено у форматі ключ=значення"
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr "Профіль скрипту для встановлення"
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr "Каталог виведення даних скрипту для встановлення"
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr "Префікс назви файла виведених даних"
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr "Джерело даних для встановлення, яке буде використано скриптом"
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr "Встановити значення параметра налаштування"
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
-msgstr ""
+msgstr "Встановити параметри налаштування"
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr "Список параметрів налаштування"
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr "Список профілів скрипту встановлення"
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr "Список підтримуваних методів вставлення"
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr "Не показувати виведених назв файлів"
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr "Немає скрипту встановлення для профілю «%s» та ОС «%s»"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr "обов’язковий"
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr "додатковий"
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr "Немає скрипту для встановлення для профілю «%s» і ОС «%s»\n"
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr "Не вдалося створити скрипт для встановлення: %s\n"
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr "- Створення скрипту для встановлення ОС"
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr "Помилка під час спроби обробити параметри: %s\n"
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
@@ -654,92 +670,93 @@ msgstr ""
 "Можна задавати лише один з параметрів, --list-profile, --list-config або --"
 "list-injection-methods"
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr "Помилка під час спроби знайти ОС: %s\n"
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr "Сімейство"
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr "Дистрибутив"
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr "Дата випуску"
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr "Дата завершення підтримки"
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr "Кодова назва"
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr "Ід."
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr "Ід. виробника"
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr "Продукт"
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr "Ід. продукту"
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr "Клас"
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr "Канал"
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr "Невідома назва властивості, %s"
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr "Синтаксична помилка у записі умови, мало бути: КЛЮЧ=ЗНАЧЕННЯ"
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr "Стовпчик для впорядковування"
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr "Показані поля"
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr "- Надсилання запиту до бази даних щодо ОС"
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr "Не вистачає параметра типу даних\n"
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr "Надіслано запит щодо невідомого типу, «%s»\n"
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr "Не вдалося побудувати фільтр: %s\n"
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr "Не вдалося встановити параметр видимості поля: %s\n"
diff --git a/po/ur.po b/po/ur.po
index 28b3cbe..bca081a 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Urdu\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index a3ed1ed..a5f44b7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Vietnamese\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/wba.po b/po/wba.po
index 07529bd..c0f314e 100644
--- a/po/wba.po
+++ b/po/wba.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: wba\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/yo.po b/po/yo.po
index d4dce95..1aad93c 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Yoruba\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2224bc4..8ff1e42 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Chinese (China)\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2603adb..f2def09 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Chinese (Hong Kong SAR China)\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0a65a4e..cc9404b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Chinese (Taiwan)\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""
diff --git a/po/zu.po b/po/zu.po
index 47b4bd9..07ac592 100644
--- a/po/zu.po
+++ b/po/zu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: https://gitlab.com/libosinfo/libosinfo/issues\n"
-"POT-Creation-Date: 2019-07-26 20:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-29 13:52+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Zulu\n"
@@ -18,317 +18,324 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.9.5\n"
 
-#: osinfo/osinfo_avatar_format.c:109
+#: osinfo/osinfo_avatar_format.c:107
 msgid "The allowed mime-types for the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:123
+#: osinfo/osinfo_avatar_format.c:121
 msgid "The required width (in pixels) of the avatar"
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:140
+#: osinfo/osinfo_avatar_format.c:138
 msgid "The required height (in pixels) of the avatar."
 msgstr ""
 
-#: osinfo/osinfo_avatar_format.c:157
+#: osinfo/osinfo_avatar_format.c:155
 msgid "Whether alpha channel is supported in the avatar."
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:148
+#: osinfo/osinfo_deployment.c:146
 msgid "Operating system"
 msgstr ""
 
-#: osinfo/osinfo_deployment.c:163
+#: osinfo/osinfo_deployment.c:161
 msgid "Virtualization platform"
 msgstr ""
 
-#: osinfo/osinfo_devicelink.c:129
+#: osinfo/osinfo_devicelink.c:127
 msgid "Target device"
 msgstr ""
 
-#: osinfo/osinfo_devicelinkfilter.c:134
+#: osinfo/osinfo_devicelinkfilter.c:132
 msgid "Device link target filter"
 msgstr ""
 
-#: osinfo/osinfo_entity.c:136
+#: osinfo/osinfo_entity.c:134
 msgid "Unique identifier"
 msgstr ""
 
-#: osinfo/osinfo_image.c:170 osinfo/osinfo_media.c:485
-#: osinfo/osinfo_resources.c:171 osinfo/osinfo_tree.c:316
+#: osinfo/osinfo_firmware.c:133 osinfo/osinfo_image.c:168
+#: osinfo/osinfo_media.c:483 osinfo/osinfo_resources.c:169
+#: osinfo/osinfo_tree.c:316
 msgid "CPU Architecture"
 msgstr ""
 
-#: osinfo/osinfo_image.c:183
+#: osinfo/osinfo_firmware.c:146
+msgid "The firmware type"
+msgstr ""
+
+#: osinfo/osinfo_image.c:181
 msgid "The image format"
 msgstr ""
 
-#: osinfo/osinfo_image.c:196
+#: osinfo/osinfo_image.c:194
 msgid "The URL to this image"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:152
+#: osinfo/osinfo_install_config_param.c:150
 msgid "Parameter name"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:168
+#: osinfo/osinfo_install_config_param.c:166
 msgid "Parameter policy"
 msgstr ""
 
-#: osinfo/osinfo_install_config_param.c:184
+#: osinfo/osinfo_install_config_param.c:182
 msgid "Parameter Value Mapping"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:214
+#: osinfo/osinfo_install_script.c:212
 msgid "URI for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:226
+#: osinfo/osinfo_install_script.c:224
 msgid "Data for install script template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:238
+#: osinfo/osinfo_install_script.c:236
 msgid "Install script profile name"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:250
+#: osinfo/osinfo_install_script.c:248
 msgid "Product key format mask"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:260
+#: osinfo/osinfo_install_script.c:258
 msgid "Expected path format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:271
+#: osinfo/osinfo_install_script.c:269
 msgid "Expected avatar format"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:281
+#: osinfo/osinfo_install_script.c:279
 msgid "The preferred injection method"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:293
+#: osinfo/osinfo_install_script.c:291
 msgid "The installation source to be used"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:723
+#: osinfo/osinfo_install_script.c:721
 msgid "Unable to create XML parser context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:731
+#: osinfo/osinfo_install_script.c:729
 msgid "Unable to read XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:737
+#: osinfo/osinfo_install_script.c:735
 msgid "Unable to parse XSL template"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:828 osinfo/osinfo_install_script.c:859
+#: osinfo/osinfo_install_script.c:826 osinfo/osinfo_install_script.c:857
 #, c-format
 msgid "Unable to create XML node '%s'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:834
+#: osinfo/osinfo_install_script.c:832
 msgid "Unable to create XML node 'id'"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:838 osinfo/osinfo_install_script.c:864
+#: osinfo/osinfo_install_script.c:836 osinfo/osinfo_install_script.c:862
 msgid "Unable to add XML child"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:911 osinfo/osinfo_install_script.c:921
-#: osinfo/osinfo_install_script.c:955
+#: osinfo/osinfo_install_script.c:909 osinfo/osinfo_install_script.c:919
+#: osinfo/osinfo_install_script.c:953
 msgid "Unable to set XML root"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:932
+#: osinfo/osinfo_install_script.c:930
 msgid "Unable to set 'media' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:944
+#: osinfo/osinfo_install_script.c:942
 msgid "Unable to set 'tree' node"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:978
+#: osinfo/osinfo_install_script.c:976
 msgid "Unable to create XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:983
+#: osinfo/osinfo_install_script.c:981
 msgid "Unable to apply XSL transform context"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:988
+#: osinfo/osinfo_install_script.c:986
 msgid "Unable to convert XSL output to string"
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1049
+#: osinfo/osinfo_install_script.c:1047
 #, c-format
 msgid "Failed to load script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1065
+#: osinfo/osinfo_install_script.c:1063
 #, c-format
 msgid "Failed to apply script template %s: "
 msgstr ""
 
-#: osinfo/osinfo_install_script.c:1123 osinfo/osinfo_install_script.c:2030
-#: osinfo/osinfo_install_script.c:2081 osinfo/osinfo_install_script.c:2131
+#: osinfo/osinfo_install_script.c:1121 osinfo/osinfo_install_script.c:2028
+#: osinfo/osinfo_install_script.c:2079 osinfo/osinfo_install_script.c:2129
 msgid "Failed to apply script template: "
 msgstr ""
 
-#: osinfo/osinfo_list.c:132
+#: osinfo/osinfo_list.c:130
 msgid "List element type"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:216
+#: osinfo/osinfo_loader.c:215
 #, c-format
 msgid "Expected a nodeset in XPath query %s"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:296 osinfo/osinfo_loader.c:439
+#: osinfo/osinfo_loader.c:295 osinfo/osinfo_loader.c:438
 msgid "Expected a text node attribute value"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:592
+#: osinfo/osinfo_loader.c:591
 msgid "Missing device id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:627
+#: osinfo/osinfo_loader.c:626
 msgid "Missing device link id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:686
+#: osinfo/osinfo_loader.c:685
 msgid "Missing product upgrades id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:770
+#: osinfo/osinfo_loader.c:769
 msgid "Missing platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:804
+#: osinfo/osinfo_loader.c:803
 msgid "Missing deployment id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:814
+#: osinfo/osinfo_loader.c:813
 msgid "Missing deployment os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:824
+#: osinfo/osinfo_loader.c:823
 msgid "Missing deployment platform id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:863 osinfo/osinfo_loader.c:1573
+#: osinfo/osinfo_loader.c:862 osinfo/osinfo_loader.c:1607
 msgid "Missing os id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:987
+#: osinfo/osinfo_loader.c:986
 msgid "Missing install script id property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1221
+#: osinfo/osinfo_loader.c:1220
 msgid "Missing Media install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1708
+#: osinfo/osinfo_loader.c:1760
 msgid "Missing OS install script property"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1772
+#: osinfo/osinfo_loader.c:1824
 msgid "Incorrect root element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1839
+#: osinfo/osinfo_loader.c:1891
 msgid "Unable to construct parser context"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:1861
+#: osinfo/osinfo_loader.c:1913
 msgid "Missing root XML element"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2495
+#: osinfo/osinfo_loader.c:2551
+#, c-format
 msgid ""
 "$OSINFO_DATA_DIR is deprecated, please use $OSINFO_SYSTEM_DIR instead. "
 "Support for $OSINFO_DATA_DIR will be removed in a future release\n"
 msgstr ""
 
-#: osinfo/osinfo_loader.c:2531 osinfo/osinfo_loader.c:2563
+#: osinfo/osinfo_loader.c:2587 osinfo/osinfo_loader.c:2619
 #, c-format
 msgid ""
 "%s is deprecated, please use %s instead. Support for %s will be removed in a "
 "future release\n"
 msgstr ""
 
-#: osinfo/osinfo_media.c:498
+#: osinfo/osinfo_media.c:496
 msgid "The URL to this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:511
+#: osinfo/osinfo_media.c:509
 msgid "The expected ISO9660 volume ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:524
+#: osinfo/osinfo_media.c:522
 msgid "The expected ISO9660 publisher ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:537
+#: osinfo/osinfo_media.c:535
 msgid "The expected ISO9660 application ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:550
+#: osinfo/osinfo_media.c:548
 msgid "The expected ISO9660 system ID"
 msgstr ""
 
-#: osinfo/osinfo_media.c:563 osinfo/osinfo_tree.c:342
+#: osinfo/osinfo_media.c:561 osinfo/osinfo_tree.c:342
 msgid "The path to the kernel image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:576
+#: osinfo/osinfo_media.c:574
 msgid "The path to the initrd image"
 msgstr ""
 
-#: osinfo/osinfo_media.c:589
+#: osinfo/osinfo_media.c:587
 msgid "Media provides an installer"
 msgstr ""
 
-#: osinfo/osinfo_media.c:602
+#: osinfo/osinfo_media.c:600
 msgid "Media can boot directly w/o installation"
 msgstr ""
 
-#: osinfo/osinfo_media.c:624
+#: osinfo/osinfo_media.c:622
 msgid "Number of installer reboots"
 msgstr ""
 
-#: osinfo/osinfo_media.c:642
+#: osinfo/osinfo_media.c:640
 msgid "Information about the operating system on this media"
 msgstr ""
 
-#: osinfo/osinfo_media.c:664
+#: osinfo/osinfo_media.c:662
 msgid "Supported languages"
 msgstr ""
 
-#: osinfo/osinfo_media.c:676
+#: osinfo/osinfo_media.c:674
 msgid "Expected ISO9660 volume size, in bytes"
 msgstr ""
 
-#: osinfo/osinfo_media.c:696
+#: osinfo/osinfo_media.c:694
 msgid "Whether the media should be ejected after the installtion process"
 msgstr ""
 
-#: osinfo/osinfo_media.c:712
+#: osinfo/osinfo_media.c:710
 msgid ""
 "Whether the media should be used for an installation using install scripts"
 msgstr ""
 
-#: osinfo/osinfo_media.c:843
+#: osinfo/osinfo_media.c:841
+#, c-format
 msgid "Install media is not bootable"
 msgstr ""
 
-#: osinfo/osinfo_media.c:917
+#: osinfo/osinfo_media.c:915
 #, c-format
 msgid "Failed to read \"%s\" directory record extent: "
 msgstr ""
 
-#: osinfo/osinfo_media.c:926
+#: osinfo/osinfo_media.c:924
 #, c-format
 msgid "No \"%s\" directory record extent"
 msgstr ""
@@ -338,6 +345,7 @@ msgid "Failed to read supplementary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1135
+#, c-format
 msgid "Supplementary volume descriptor was truncated"
 msgstr ""
 
@@ -346,10 +354,12 @@ msgid "Failed to read primary volume descriptor: "
 msgstr ""
 
 #: osinfo/osinfo_media.c:1209
+#, c-format
 msgid "Primary volume descriptor was truncated"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1241
+#, c-format
 msgid "Insufficient metadata on installation media"
 msgstr ""
 
@@ -359,6 +369,7 @@ msgid "Failed to skip %d bytes"
 msgstr ""
 
 #: osinfo/osinfo_media.c:1281
+#, c-format
 msgid "No volume descriptors"
 msgstr ""
 
@@ -378,45 +389,45 @@ msgstr ""
 msgid "Kernel URL Argument"
 msgstr ""
 
-#: osinfo/osinfo_product.c:168 tools/osinfo-query.c:58 tools/osinfo-query.c:82
-#: tools/osinfo-query.c:108
+#: osinfo/osinfo_product.c:166 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: tools/osinfo-query.c:106
 msgid "Name"
 msgstr ""
 
-#: osinfo/osinfo_product.c:181 tools/osinfo-query.c:56 tools/osinfo-query.c:80
+#: osinfo/osinfo_product.c:179 tools/osinfo-query.c:54 tools/osinfo-query.c:78
 msgid "Short ID"
 msgstr ""
 
-#: osinfo/osinfo_product.c:194 tools/osinfo-query.c:66 tools/osinfo-query.c:86
-#: tools/osinfo-query.c:100
+#: osinfo/osinfo_product.c:192 tools/osinfo-query.c:64 tools/osinfo-query.c:84
+#: tools/osinfo-query.c:98
 msgid "Vendor"
 msgstr ""
 
-#: osinfo/osinfo_product.c:207 tools/osinfo-query.c:60 tools/osinfo-query.c:84
+#: osinfo/osinfo_product.c:205 tools/osinfo-query.c:58 tools/osinfo-query.c:82
 msgid "Version"
 msgstr ""
 
-#: osinfo/osinfo_product.c:220
+#: osinfo/osinfo_product.c:218
 msgid "Codename"
 msgstr ""
 
-#: osinfo/osinfo_product.c:233
+#: osinfo/osinfo_product.c:231
 msgid "URI of the logo"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:187
+#: osinfo/osinfo_resources.c:185
 msgid "CPU frequency in hertz (Hz)"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:204
+#: osinfo/osinfo_resources.c:202
 msgid "Number of CPUs"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:221
+#: osinfo/osinfo_resources.c:219
 msgid "Amount of Random Access Memory (RAM) in bytes"
 msgstr ""
 
-#: osinfo/osinfo_resources.c:238
+#: osinfo/osinfo_resources.c:236
 msgid "Amount of storage space in bytes"
 msgstr ""
 
@@ -460,267 +471,273 @@ msgstr ""
 msgid "Failed to load .treeinfo|treeinfo content: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:711
+#: osinfo/osinfo_tree.c:711 osinfo/osinfo_tree.c:801
 msgid "Failed to process keyinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:751
+#: osinfo/osinfo_tree.c:751 osinfo/osinfo_tree.c:792
 msgid "Failed to load .treeinfo|treeinfo file: "
 msgstr ""
 
-#: osinfo/osinfo_tree.c:783
+#: osinfo/osinfo_tree.c:830
 msgid "URL protocol is not supported"
 msgstr ""
 
-#: osinfo/osinfo_os_variant.c:115
+#: osinfo/osinfo_os_variant.c:113
 msgid "The name to this variant"
 msgstr ""
 
-#: tools/osinfo-detect.c:64 tools/osinfo-detect.c:85
+#: tools/osinfo-detect.c:58 tools/osinfo-detect.c:79
 #, c-format
 msgid "Invalid value '%s'"
 msgstr ""
 
-#: tools/osinfo-detect.c:97
+#: tools/osinfo-detect.c:91
 msgid "Output format. Default: plain"
 msgstr ""
 
-#: tools/osinfo-detect.c:98
-msgid "plain|env."
+#: tools/osinfo-detect.c:92
+msgid "plain."
 msgstr ""
 
-#: tools/osinfo-detect.c:101
+#: tools/osinfo-detect.c:95
 msgid "The type to be used. Default: media"
 msgstr ""
 
-#: tools/osinfo-detect.c:102
+#: tools/osinfo-detect.c:96
 msgid "media|tree."
 msgstr ""
 
-#: tools/osinfo-detect.c:112
+#: tools/osinfo-detect.c:103
+#, c-format
 msgid "Media is bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:117
+#: tools/osinfo-detect.c:105
+#, c-format
 msgid "Media is not bootable.\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:156
+#: tools/osinfo-detect.c:136
 #, c-format
-msgid "Media is an installer for OS '%s'\n"
+msgid "Media is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:158
+#: tools/osinfo-detect.c:138
 #, c-format
-msgid "Media is live media for OS '%s'\n"
+msgid "Media is live media for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:163
+#: tools/osinfo-detect.c:143
+#, c-format
 msgid "Available OS variants on media:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:226
+#: tools/osinfo-detect.c:185
 #, c-format
-msgid "Tree is an installer for OS '%s'\n"
+msgid "Tree is an installer for OS '%s (%s)'\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:231
+#: tools/osinfo-detect.c:190
+#, c-format
 msgid "Available OS variants on tree:\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:258
+#: tools/osinfo-detect.c:217
 msgid "- Detect if media is bootable and the relevant OS and distribution."
 msgstr ""
 
-#: tools/osinfo-detect.c:262 tools/osinfo-query.c:414
+#: tools/osinfo-detect.c:221 tools/osinfo-query.c:412
 #, c-format
 msgid "Error while parsing commandline options: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:280 tools/osinfo-install-script.c:429
-#: tools/osinfo-query.c:430
+#: tools/osinfo-detect.c:239 tools/osinfo-install-script.c:427
+#: tools/osinfo-query.c:428
 #, c-format
 msgid "Error loading OS data: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:296
+#: tools/osinfo-detect.c:255
 #, c-format
 msgid "Error parsing media: %s\n"
 msgstr ""
 
-#: tools/osinfo-detect.c:312
+#: tools/osinfo-detect.c:271
 #, c-format
 msgid "Error parsing installer tree: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:81
+#: tools/osinfo-install-script.c:79
+#, c-format
 msgid "Expected configuration key=value"
 msgstr ""
 
-#: tools/osinfo-install-script.c:146
+#: tools/osinfo-install-script.c:144
 msgid "Install script profile"
 msgstr ""
 
-#: tools/osinfo-install-script.c:148
+#: tools/osinfo-install-script.c:146
 msgid "Install script output directory"
 msgstr ""
 
-#: tools/osinfo-install-script.c:150
+#: tools/osinfo-install-script.c:148
 msgid "The output filename prefix"
 msgstr ""
 
-#: tools/osinfo-install-script.c:152
+#: tools/osinfo-install-script.c:150
 msgid "The installation source to be used with the script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:155
+#: tools/osinfo-install-script.c:153
 msgid "Set configuration parameter"
 msgstr ""
 
-#: tools/osinfo-install-script.c:158
+#: tools/osinfo-install-script.c:156
 msgid "Set configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:160
+#: tools/osinfo-install-script.c:158
 msgid "List configuration parameters"
 msgstr ""
 
-#: tools/osinfo-install-script.c:162
+#: tools/osinfo-install-script.c:160
 msgid "List install script profiles"
 msgstr ""
 
-#: tools/osinfo-install-script.c:164
+#: tools/osinfo-install-script.c:162
 msgid "List supported injection methods"
 msgstr ""
 
-#: tools/osinfo-install-script.c:166
+#: tools/osinfo-install-script.c:164
 msgid "Do not display output filenames"
 msgstr ""
 
-#: tools/osinfo-install-script.c:223
+#: tools/osinfo-install-script.c:221
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "required"
 msgstr ""
 
-#: tools/osinfo-install-script.c:239
+#: tools/osinfo-install-script.c:237
 msgid "optional"
 msgstr ""
 
-#: tools/osinfo-install-script.c:325
+#: tools/osinfo-install-script.c:323
 #, c-format
 msgid "No install script for profile '%s' and OS '%s'\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:361
+#: tools/osinfo-install-script.c:359
 #, c-format
 msgid "Unable to generate install script: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:398
+#: tools/osinfo-install-script.c:396
 msgid "- Generate an OS install script"
 msgstr ""
 
-#: tools/osinfo-install-script.c:401
+#: tools/osinfo-install-script.c:399
 #, c-format
 msgid "Error while parsing options: %s\n"
 msgstr ""
 
-#: tools/osinfo-install-script.c:419
+#: tools/osinfo-install-script.c:417
 msgid ""
 "Only one of --list-profile, --list-config and --list-injection-methods can "
 "be requested"
 msgstr ""
 
-#: tools/osinfo-install-script.c:448
+#: tools/osinfo-install-script.c:446
 #, c-format
 msgid "Error finding OS: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:62
+#: tools/osinfo-query.c:60
 msgid "Family"
 msgstr ""
 
-#: tools/osinfo-query.c:64
+#: tools/osinfo-query.c:62
 msgid "Distro"
 msgstr ""
 
-#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
+#: tools/osinfo-query.c:66 tools/osinfo-query.c:86
 msgid "Release date"
 msgstr ""
 
-#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
+#: tools/osinfo-query.c:68 tools/osinfo-query.c:88
 msgid "End of life"
 msgstr ""
 
-#: tools/osinfo-query.c:72 tools/osinfo-query.c:92
+#: tools/osinfo-query.c:70 tools/osinfo-query.c:90
 msgid "Code name"
 msgstr ""
 
-#: tools/osinfo-query.c:74 tools/osinfo-query.c:94 tools/osinfo-query.c:114
-#: tools/osinfo-query.c:120
+#: tools/osinfo-query.c:72 tools/osinfo-query.c:92 tools/osinfo-query.c:112
+#: tools/osinfo-query.c:118
 msgid "ID"
 msgstr ""
 
-#: tools/osinfo-query.c:102
+#: tools/osinfo-query.c:100
 msgid "Vendor ID"
 msgstr ""
 
-#: tools/osinfo-query.c:104
+#: tools/osinfo-query.c:102
 msgid "Product"
 msgstr ""
 
-#: tools/osinfo-query.c:106
+#: tools/osinfo-query.c:104
 msgid "Product ID"
 msgstr ""
 
-#: tools/osinfo-query.c:110
+#: tools/osinfo-query.c:108
 msgid "Class"
 msgstr ""
 
-#: tools/osinfo-query.c:112
+#: tools/osinfo-query.c:110
 msgid "Bus"
 msgstr ""
 
-#: tools/osinfo-query.c:152 tools/osinfo-query.c:190
+#: tools/osinfo-query.c:150 tools/osinfo-query.c:188
 #, c-format
 msgid "Unknown property name %s"
 msgstr ""
 
-#: tools/osinfo-query.c:176
+#: tools/osinfo-query.c:174
 msgid "Syntax error in condition, expecting KEY=VALUE"
 msgstr ""
 
-#: tools/osinfo-query.c:402
+#: tools/osinfo-query.c:400
 msgid "Sort column"
 msgstr ""
 
-#: tools/osinfo-query.c:404
+#: tools/osinfo-query.c:402
 msgid "Display fields"
 msgstr ""
 
-#: tools/osinfo-query.c:409
+#: tools/osinfo-query.c:407
 msgid "- Query the OS info database"
 msgstr ""
 
-#: tools/osinfo-query.c:421
+#: tools/osinfo-query.c:419
+#, c-format
 msgid "Missing data type parameter\n"
 msgstr ""
 
-#: tools/osinfo-query.c:449
+#: tools/osinfo-query.c:447
 #, c-format
 msgid "Unknown type '%s' requested\n"
 msgstr ""
 
-#: tools/osinfo-query.c:454
+#: tools/osinfo-query.c:452
 #, c-format
 msgid "Unable to construct filter: %s\n"
 msgstr ""
 
-#: tools/osinfo-query.c:459
+#: tools/osinfo-query.c:457
 #, c-format
 msgid "Unable to set field visibility: %s\n"
 msgstr ""